Index: AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 703)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 708)
@@ -24,10 +24,10 @@
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.Settings;
-import net.oni2.aeinstaller.backend.Settings.Platform;
-import net.oni2.aeinstaller.backend.appexecution.AppExecutionResult;
 import net.oni2.aeinstaller.backend.packages.EBSLInstallType;
 import net.oni2.aeinstaller.backend.packages.Package;
 import net.oni2.aeinstaller.backend.packages.PackageManager;
+import net.oni2.applicationinvoker.AppExecutionResult;
+import net.oni2.settingsmanager.Settings;
+import net.oni2.settingsmanager.Settings.Platform;
 
 import org.apache.commons.io.FileUtils;
Index: AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java	(revision 703)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java	(revision 708)
@@ -8,8 +8,8 @@
 import net.oni2.aeinstaller.backend.DotNet;
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.Settings;
-import net.oni2.aeinstaller.backend.Settings.Platform;
-import net.oni2.aeinstaller.backend.appexecution.AppExecution;
-import net.oni2.aeinstaller.backend.appexecution.AppExecutionResult;
+import net.oni2.applicationinvoker.AppExecution;
+import net.oni2.applicationinvoker.AppExecutionResult;
+import net.oni2.settingsmanager.Settings;
+import net.oni2.settingsmanager.Settings.Platform;
 
 /**
Index: AE/installer2/src/net/oni2/aeinstaller/backend/oni/XMLTools.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/oni/XMLTools.java	(revision 703)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/oni/XMLTools.java	(revision 708)
@@ -8,6 +8,6 @@
 import net.oni2.aeinstaller.backend.DotNet;
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.appexecution.AppExecution;
-import net.oni2.aeinstaller.backend.appexecution.AppExecutionResult;
+import net.oni2.applicationinvoker.AppExecution;
+import net.oni2.applicationinvoker.AppExecutionResult;
 
 /**