Index: AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 631)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 648)
@@ -24,7 +24,7 @@
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
-import net.oni2.aeinstaller.backend.mods.EBSLInstallType;
-import net.oni2.aeinstaller.backend.mods.Mod;
-import net.oni2.aeinstaller.backend.mods.ModManager;
+import net.oni2.aeinstaller.backend.packages.EBSLInstallType;
+import net.oni2.aeinstaller.backend.packages.Package;
+import net.oni2.aeinstaller.backend.packages.PackageManager;
 
 import org.apache.commons.io.FileUtils;
@@ -62,5 +62,5 @@
 	public static Vector<Integer> getInstalledMods() {
 		File installCfg = new File(Paths.getEditionGDF(), "installed_mods.xml");
-		return ModManager.getInstance().loadModSelection(installCfg);
+		return PackageManager.getInstance().loadModSelection(installCfg);
 	}
 
@@ -109,7 +109,7 @@
 	 *            Tools to install
 	 */
-	public static void installTools(TreeSet<Mod> tools) {
+	public static void installTools(TreeSet<Package> tools) {
 		TreeSet<Integer> installed = getInstalledTools();
-		for (Mod m : tools) {
+		for (Package m : tools) {
 			File plain = new File(m.getLocalPath(), "plain");
 			if (plain.exists()) {
@@ -138,7 +138,7 @@
 	 *            Tools to uninstall
 	 */
-	public static void uninstallTools(TreeSet<Mod> tools) {
+	public static void uninstallTools(TreeSet<Package> tools) {
 		TreeSet<Integer> installed = getInstalledTools();
-		for (Mod m : tools) {
+		for (Package m : tools) {
 			if (installed.contains(m.getPackageNumber())) {
 				File plain = new File(m.getLocalPath(), "plain");
@@ -205,5 +205,5 @@
 	 *            Listener for install progress updates
 	 */
-	public static void install(TreeSet<Mod> mods,
+	public static void install(TreeSet<Package> mods,
 			InstallProgressListener listener) {
 		try {
@@ -214,5 +214,5 @@
 
 		File installCfg = new File(Paths.getEditionGDF(), "installed_mods.xml");
-		ModManager.getInstance().saveModSelection(installCfg, mods);
+		PackageManager.getInstance().saveModSelection(installCfg, mods);
 
 		HashSet<Integer> unlockLevels = new HashSet<Integer>();
@@ -221,5 +221,5 @@
 		foldersOni.add(Paths.getVanillaOnisPath());
 
-		for (Mod m : mods) {
+		for (Package m : mods) {
 			for (int lev : m.getUnlockLevels())
 				unlockLevels.add(lev);
@@ -253,13 +253,13 @@
 	}
 
-	private static void combineBSLFolders(TreeSet<Mod> mods,
+	private static void combineBSLFolders(TreeSet<Package> mods,
 			InstallProgressListener listener) {
 		listener.installProgressUpdate(95, 100, "Installing BSL files");
 
-		HashMap<EBSLInstallType, Vector<Mod>> modsToInclude = new HashMap<EBSLInstallType, Vector<Mod>>();
-		modsToInclude.put(EBSLInstallType.NORMAL, new Vector<Mod>());
-		modsToInclude.put(EBSLInstallType.ADDON, new Vector<Mod>());
-
-		for (Mod m : mods.descendingSet()) {
+		HashMap<EBSLInstallType, Vector<Package>> modsToInclude = new HashMap<EBSLInstallType, Vector<Package>>();
+		modsToInclude.put(EBSLInstallType.NORMAL, new Vector<Package>());
+		modsToInclude.put(EBSLInstallType.ADDON, new Vector<Package>());
+
+		for (Package m : mods.descendingSet()) {
 			File bsl = new File(m.getLocalPath(), "bsl");
 			if (bsl.exists()) {
@@ -281,8 +281,8 @@
 		}
 
-		for (Mod m : modsToInclude.get(EBSLInstallType.NORMAL)) {
+		for (Package m : modsToInclude.get(EBSLInstallType.NORMAL)) {
 			copyBSL(m, false);
 		}
-		Vector<Mod> addons = modsToInclude.get(EBSLInstallType.ADDON);
+		Vector<Package> addons = modsToInclude.get(EBSLInstallType.ADDON);
 		for (int i = addons.size() - 1; i >= 0; i--) {
 			copyBSL(addons.get(i), true);
@@ -290,5 +290,5 @@
 	}
 
-	private static void copyBSL(Mod sourceMod, boolean addon) {
+	private static void copyBSL(Package sourceMod, boolean addon) {
 		File targetBaseFolder = new File(Paths.getEditionGDF(), "IGMD");
 		if (!targetBaseFolder.exists())