Index: AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotConfig.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotConfig.java	(revision 703)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotConfig.java	(revision 708)
@@ -3,5 +3,5 @@
 import java.util.TreeSet;
 
-import net.oni2.aeinstaller.backend.Settings;
+import net.oni2.settingsmanager.Settings;
 
 /**
Index: AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java	(revision 703)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java	(revision 708)
@@ -17,5 +17,4 @@
 
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.depot.model.File;
 import net.oni2.aeinstaller.backend.depot.model.Node;
@@ -280,5 +279,6 @@
 						result.add(nm);
 					} catch (NumberFormatException e) {
-						System.err.println("Node " + nm.getNid() + " does not have a package number!!!");
+						System.err.println("Node " + nm.getNid()
+								+ " does not have a package number!!!");
 					}
 				}
@@ -349,5 +349,5 @@
 		try {
 			FileOutputStream fos = new FileOutputStream(
-					Settings.getDepotCacheFilename());
+					Paths.getDepotCacheFilename());
 			XStream xs = getXStream();
 			xs.toXML(this, fos);
@@ -363,5 +363,5 @@
 		try {
 			FileInputStream fis = new FileInputStream(
-					Settings.getDepotCacheFilename());
+					Paths.getDepotCacheFilename());
 			XStream xs = getXStream();
 			Object obj = xs.fromXML(fis);
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;
 
 /**
Index: AE/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java	(revision 703)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java	(revision 708)
@@ -16,6 +16,4 @@
 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.depot.DepotConfig;
 import net.oni2.aeinstaller.backend.depot.DepotManager;
@@ -23,4 +21,6 @@
 import net.oni2.aeinstaller.backend.depot.model.TaxonomyTerm;
 import net.oni2.aeinstaller.backend.oni.Installer;
+import net.oni2.settingsmanager.Settings;
+import net.oni2.settingsmanager.Settings.Platform;
 
 /**