Reorganize sdklib.repository packages.

This splits the sdklib repository in 3 sub-packages
for archives, packages and sources.

There are a lot of files moved around but its just
a move refactoring and the only thing changes are
imports and a few methods made public.

Change-Id: I6ce0e872ac7afea2a6a4eb70ee7bbad0c04b6678

18 files changed, 104 insertions, 104 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ArchiveInfo.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ArchiveInfo.java
index d98af7e..dafcc05 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ArchiveInfo.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ArchiveInfo.java
@@ -16,8 +16,8 @@
 

 package com.android.sdkuilib.internal.repository;

 

-import com.android.sdklib.internal.repository.Archive;

-import com.android.sdklib.internal.repository.ArchiveReplacement;

+import com.android.sdklib.internal.repository.archives.Archive;

+import com.android.sdklib.internal.repository.archives.ArchiveReplacement;

 

 import java.util.ArrayList;

 import java.util.Collection;

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java
index 8577da4..b5ab90b 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java
@@ -18,10 +18,10 @@ package com.android.sdkuilib.internal.repository;
 

 import com.android.sdklib.AndroidVersion;

 import com.android.sdklib.SdkConstants;

-import com.android.sdklib.internal.repository.Archive;

-import com.android.sdklib.internal.repository.IPackageVersion;

-import com.android.sdklib.internal.repository.Package;

-import com.android.sdklib.internal.repository.SdkSource;

+import com.android.sdklib.internal.repository.archives.Archive;

+import com.android.sdklib.internal.repository.packages.IPackageVersion;

+import com.android.sdklib.internal.repository.packages.Package;

+import com.android.sdklib.internal.repository.sources.SdkSource;

 import com.android.sdkuilib.internal.repository.icons.ImageFactory;

 import com.android.sdkuilib.ui.GridDialog;

 

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterLogic.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterLogic.java
index 0d9b10a..0b9f396 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterLogic.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterLogic.java
@@ -17,28 +17,28 @@
 package com.android.sdkuilib.internal.repository;

 

 import com.android.sdklib.AndroidVersion;

-import com.android.sdklib.internal.repository.AddonPackage;

-import com.android.sdklib.internal.repository.Archive;

-import com.android.sdklib.internal.repository.DocPackage;

-import com.android.sdklib.internal.repository.ExtraPackage;

-import com.android.sdklib.internal.repository.IExactApiLevelDependency;

-import com.android.sdklib.internal.repository.IMinApiLevelDependency;

-import com.android.sdklib.internal.repository.IMinPlatformToolsDependency;

-import com.android.sdklib.internal.repository.IMinToolsDependency;

-import com.android.sdklib.internal.repository.IPackageVersion;

-import com.android.sdklib.internal.repository.IPlatformDependency;

 import com.android.sdklib.internal.repository.ITask;

 import com.android.sdklib.internal.repository.ITaskMonitor;

-import com.android.sdklib.internal.repository.MinToolsPackage;

-import com.android.sdklib.internal.repository.Package;

-import com.android.sdklib.internal.repository.Package.UpdateInfo;

-import com.android.sdklib.internal.repository.PlatformPackage;

-import com.android.sdklib.internal.repository.PlatformToolPackage;

-import com.android.sdklib.internal.repository.SamplePackage;

-import com.android.sdklib.internal.repository.SdkSource;

-import com.android.sdklib.internal.repository.SdkSources;

-import com.android.sdklib.internal.repository.SystemImagePackage;

-import com.android.sdklib.internal.repository.ToolPackage;

+import com.android.sdklib.internal.repository.archives.Archive;

+import com.android.sdklib.internal.repository.packages.AddonPackage;

+import com.android.sdklib.internal.repository.packages.DocPackage;

+import com.android.sdklib.internal.repository.packages.ExtraPackage;

+import com.android.sdklib.internal.repository.packages.IExactApiLevelDependency;

+import com.android.sdklib.internal.repository.packages.IMinApiLevelDependency;

+import com.android.sdklib.internal.repository.packages.IMinPlatformToolsDependency;

+import com.android.sdklib.internal.repository.packages.IMinToolsDependency;

+import com.android.sdklib.internal.repository.packages.IPackageVersion;

+import com.android.sdklib.internal.repository.packages.IPlatformDependency;

+import com.android.sdklib.internal.repository.packages.MinToolsPackage;

+import com.android.sdklib.internal.repository.packages.Package;

+import com.android.sdklib.internal.repository.packages.PlatformPackage;

+import com.android.sdklib.internal.repository.packages.PlatformToolPackage;

+import com.android.sdklib.internal.repository.packages.SamplePackage;

+import com.android.sdklib.internal.repository.packages.SystemImagePackage;

+import com.android.sdklib.internal.repository.packages.ToolPackage;

+import com.android.sdklib.internal.repository.packages.Package.UpdateInfo;

+import com.android.sdklib.internal.repository.sources.SdkSource;

+import com.android.sdklib.internal.repository.sources.SdkSources;

 

 import java.util.ArrayList;

 import java.util.Arrays;

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
index 0def6fa..a58e0f0 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
@@ -24,25 +24,25 @@ import com.android.sdklib.SdkConstants;
 import com.android.sdklib.SdkManager;

 import com.android.sdklib.internal.avd.AvdManager;

 import com.android.sdklib.internal.repository.AdbWrapper;

-import com.android.sdklib.internal.repository.AddonPackage;

 import com.android.sdklib.internal.repository.AddonsListFetcher;

 import com.android.sdklib.internal.repository.AddonsListFetcher.Site;

-import com.android.sdklib.internal.repository.Archive;

-import com.android.sdklib.internal.repository.ArchiveInstaller;

+import com.android.sdklib.internal.repository.archives.Archive;

+import com.android.sdklib.internal.repository.archives.ArchiveInstaller;

+import com.android.sdklib.internal.repository.packages.AddonPackage;

+import com.android.sdklib.internal.repository.packages.Package;

+import com.android.sdklib.internal.repository.packages.PlatformToolPackage;

+import com.android.sdklib.internal.repository.packages.ToolPackage;

+import com.android.sdklib.internal.repository.sources.SdkAddonSource;

+import com.android.sdklib.internal.repository.sources.SdkRepoSource;

+import com.android.sdklib.internal.repository.sources.SdkSource;

+import com.android.sdklib.internal.repository.sources.SdkSourceCategory;

+import com.android.sdklib.internal.repository.sources.SdkSources;

 import com.android.sdklib.internal.repository.DownloadCache;

 import com.android.sdklib.internal.repository.ITask;

 import com.android.sdklib.internal.repository.ITaskFactory;

 import com.android.sdklib.internal.repository.ITaskMonitor;

 import com.android.sdklib.internal.repository.LocalSdkParser;

 import com.android.sdklib.internal.repository.NullTaskMonitor;

-import com.android.sdklib.internal.repository.Package;

-import com.android.sdklib.internal.repository.PlatformToolPackage;

-import com.android.sdklib.internal.repository.SdkAddonSource;

-import com.android.sdklib.internal.repository.SdkRepoSource;

-import com.android.sdklib.internal.repository.SdkSource;

-import com.android.sdklib.internal.repository.SdkSourceCategory;

-import com.android.sdklib.internal.repository.SdkSources;

-import com.android.sdklib.internal.repository.ToolPackage;

 import com.android.sdklib.repository.SdkAddonConstants;

 import com.android.sdklib.repository.SdkAddonsListConstants;

 import com.android.sdklib.repository.SdkRepoConstants;

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/ImageFactory.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/ImageFactory.java
index 1d58541..aaa190c 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/ImageFactory.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/ImageFactory.java
@@ -16,10 +16,10 @@
 

 package com.android.sdkuilib.internal.repository.icons;

 

-import com.android.sdklib.internal.repository.Archive;

-import com.android.sdklib.internal.repository.Package;

-import com.android.sdklib.internal.repository.SdkSource;

-import com.android.sdklib.internal.repository.SdkSourceCategory;

+import com.android.sdklib.internal.repository.archives.Archive;

+import com.android.sdklib.internal.repository.packages.Package;

+import com.android.sdklib.internal.repository.sources.SdkSource;

+import com.android.sdklib.internal.repository.sources.SdkSourceCategory;

 import com.android.sdkuilib.internal.repository.sdkman2.PkgContentProvider;

 

 import org.eclipse.swt.SWTException;

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java
index 015539c..10b02c6 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java
@@ -16,11 +16,11 @@
 
 package com.android.sdkuilib.internal.repository.sdkman2;
 
-import com.android.sdklib.internal.repository.SdkAddonSource;
-import com.android.sdklib.internal.repository.SdkSource;
-import com.android.sdklib.internal.repository.SdkSourceCategory;
-import com.android.sdklib.internal.repository.SdkSourceProperties;
-import com.android.sdklib.internal.repository.SdkSources;
+import com.android.sdklib.internal.repository.sources.SdkAddonSource;
+import com.android.sdklib.internal.repository.sources.SdkSource;
+import com.android.sdklib.internal.repository.sources.SdkSourceCategory;
+import com.android.sdklib.internal.repository.sources.SdkSourceProperties;
+import com.android.sdklib.internal.repository.sources.SdkSources;
 import com.android.sdkuilib.internal.repository.UpdaterBaseDialog;
 import com.android.sdkuilib.internal.repository.UpdaterData;
 import com.android.sdkuilib.ui.GridDataBuilder;
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java
index 2311df2..d619ea0 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java
@@ -19,12 +19,12 @@ package com.android.sdkuilib.internal.repository.sdkman2;
 

 import com.android.sdklib.AndroidVersion;

 import com.android.sdklib.ISdkLog;

-import com.android.sdklib.internal.repository.ExtraPackage;

-import com.android.sdklib.internal.repository.Package;

-import com.android.sdklib.internal.repository.PlatformPackage;

-import com.android.sdklib.internal.repository.PlatformToolPackage;

-import com.android.sdklib.internal.repository.SdkSource;

-import com.android.sdklib.internal.repository.ToolPackage;

+import com.android.sdklib.internal.repository.packages.ExtraPackage;

+import com.android.sdklib.internal.repository.packages.Package;

+import com.android.sdklib.internal.repository.packages.PlatformPackage;

+import com.android.sdklib.internal.repository.packages.PlatformToolPackage;

+import com.android.sdklib.internal.repository.packages.ToolPackage;

+import com.android.sdklib.internal.repository.sources.SdkSource;

 import com.android.sdkuilib.internal.repository.SettingsController;

 import com.android.sdkuilib.internal.repository.UpdaterData;

 import com.android.sdkuilib.internal.repository.sdkman2.PackageLoader.IAutoInstallTask;

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java
index ad9a2a2..4ac03e9 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java
@@ -16,14 +16,14 @@
 
 package com.android.sdkuilib.internal.repository.sdkman2;
 
-import com.android.sdklib.internal.repository.Archive;
 import com.android.sdklib.internal.repository.DownloadCache;
 import com.android.sdklib.internal.repository.ITask;
 import com.android.sdklib.internal.repository.ITaskMonitor;
 import com.android.sdklib.internal.repository.NullTaskMonitor;
-import com.android.sdklib.internal.repository.Package;
-import com.android.sdklib.internal.repository.Package.UpdateInfo;
-import com.android.sdklib.internal.repository.SdkSource;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.packages.Package;
+import com.android.sdklib.internal.repository.packages.Package.UpdateInfo;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdkuilib.internal.repository.UpdaterData;
 
 import org.eclipse.swt.widgets.Display;
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java
index 0774905..46b5697 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java
@@ -19,14 +19,14 @@ package com.android.sdkuilib.internal.repository.sdkman2;
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
-import com.android.sdklib.internal.repository.ExtraPackage;
-import com.android.sdklib.internal.repository.IPackageVersion;
-import com.android.sdklib.internal.repository.Package;
-import com.android.sdklib.internal.repository.PlatformPackage;
-import com.android.sdklib.internal.repository.PlatformToolPackage;
-import com.android.sdklib.internal.repository.SdkSource;
-import com.android.sdklib.internal.repository.SystemImagePackage;
-import com.android.sdklib.internal.repository.ToolPackage;
+import com.android.sdklib.internal.repository.packages.ExtraPackage;
+import com.android.sdklib.internal.repository.packages.IPackageVersion;
+import com.android.sdklib.internal.repository.packages.Package;
+import com.android.sdklib.internal.repository.packages.PlatformPackage;
+import com.android.sdklib.internal.repository.packages.PlatformToolPackage;
+import com.android.sdklib.internal.repository.packages.SystemImagePackage;
+import com.android.sdklib.internal.repository.packages.ToolPackage;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdklib.util.SparseArray;
 import com.android.sdkuilib.internal.repository.UpdaterData;
 import com.android.sdkuilib.internal.repository.sdkman2.PkgItem.PkgState;
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java
index e0d97f9..4ef7d6b 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java
@@ -17,13 +17,13 @@
 package com.android.sdkuilib.internal.repository.sdkman2;
 
 import com.android.sdklib.SdkConstants;
-import com.android.sdklib.internal.repository.Archive;
-import com.android.sdklib.internal.repository.ArchiveInstaller;
 import com.android.sdklib.internal.repository.IDescription;
 import com.android.sdklib.internal.repository.ITask;
 import com.android.sdklib.internal.repository.ITaskMonitor;
-import com.android.sdklib.internal.repository.Package;
-import com.android.sdklib.internal.repository.SdkSource;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.archives.ArchiveInstaller;
+import com.android.sdklib.internal.repository.packages.Package;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdkuilib.internal.repository.UpdaterData;
 import com.android.sdkuilib.internal.repository.UpdaterPage;
 import com.android.sdkuilib.internal.repository.icons.ImageFactory;
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgCategorySource.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgCategorySource.java
index 5b589d0..7e08cf1 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgCategorySource.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgCategorySource.java
@@ -16,8 +16,8 @@
 
 package com.android.sdkuilib.internal.repository.sdkman2;
 
-import com.android.sdklib.internal.repository.SdkRepoSource;
-import com.android.sdklib.internal.repository.SdkSource;
+import com.android.sdklib.internal.repository.sources.SdkRepoSource;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdkuilib.internal.repository.UpdaterData;
 
 
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgContentProvider.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgContentProvider.java
index 4867ebb..f1be1ec 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgContentProvider.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgContentProvider.java
@@ -16,10 +16,10 @@
 
 package com.android.sdkuilib.internal.repository.sdkman2;
 
-import com.android.sdklib.internal.repository.Archive;
 import com.android.sdklib.internal.repository.IDescription;
-import com.android.sdklib.internal.repository.Package;
-import com.android.sdklib.internal.repository.SdkSource;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.packages.Package;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgItem.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgItem.java
index e943819..5b90375 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgItem.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgItem.java
@@ -16,11 +16,11 @@
 
 package com.android.sdkuilib.internal.repository.sdkman2;
 
-import com.android.sdklib.internal.repository.Archive;
-import com.android.sdklib.internal.repository.IPackageVersion;
-import com.android.sdklib.internal.repository.Package;
-import com.android.sdklib.internal.repository.Package.UpdateInfo;
-import com.android.sdklib.internal.repository.SdkSource;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.packages.IPackageVersion;
+import com.android.sdklib.internal.repository.packages.Package;
+import com.android.sdklib.internal.repository.packages.Package.UpdateInfo;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 
 /**
  * A {@link PkgItem} represents one main {@link Package} combined with its state
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java
index febbf49..9a7ffe1 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java
@@ -20,7 +20,7 @@ package com.android.sdkuilib.internal.repository.sdkman2;
 import com.android.sdklib.ISdkLog;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.internal.repository.ITaskFactory;

-import com.android.sdklib.internal.repository.SdkSourceProperties;

+import com.android.sdklib.internal.repository.sources.SdkSourceProperties;

 import com.android.sdkuilib.internal.repository.AboutDialog;

 import com.android.sdkuilib.internal.repository.ISdkUpdaterWindow;

 import com.android.sdkuilib.internal.repository.MenuBarWrapper;

diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java
index e691429..2260739 100755
--- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java
+++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java
@@ -18,14 +18,14 @@ package com.android.sdkuilib.internal.repository;
 
 import com.android.sdklib.NullSdkLog;
 import com.android.sdklib.SdkManager;
-import com.android.sdklib.internal.repository.ArchiveInstaller;
-import com.android.sdklib.internal.repository.ArchiveReplacement;
 import com.android.sdklib.internal.repository.DownloadCache;
 import com.android.sdklib.internal.repository.ITask;
 import com.android.sdklib.internal.repository.ITaskFactory;
 import com.android.sdklib.internal.repository.ITaskMonitor;
 import com.android.sdklib.internal.repository.MockEmptySdkManager;
 import com.android.sdklib.internal.repository.NullTaskMonitor;
+import com.android.sdklib.internal.repository.archives.ArchiveInstaller;
+import com.android.sdklib.internal.repository.archives.ArchiveReplacement;
 import com.android.sdklib.mock.MockLog;
 import com.android.sdkuilib.internal.repository.icons.ImageFactory;
 
diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterDataTest.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterDataTest.java
index d1d95d7..6b8c850 100755
--- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterDataTest.java
+++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterDataTest.java
@@ -16,8 +16,8 @@
 
 package com.android.sdkuilib.internal.repository;
 
-import com.android.sdklib.internal.repository.Archive;
-import com.android.sdklib.internal.repository.MockEmptyPackage;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.packages.MockEmptyPackage;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterLogicTest.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterLogicTest.java
index 245ca84..f186c84 100755
--- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterLogicTest.java
+++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterLogicTest.java
@@ -19,17 +19,17 @@ package com.android.sdkuilib.internal.repository;
 import com.android.sdklib.ISdkLog;

 import com.android.sdklib.SdkManager;

 import com.android.sdklib.internal.avd.AvdManager;

-import com.android.sdklib.internal.repository.Archive;

 import com.android.sdklib.internal.repository.ITaskFactory;

-import com.android.sdklib.internal.repository.MockAddonPackage;

-import com.android.sdklib.internal.repository.MockBrokenPackage;

-import com.android.sdklib.internal.repository.MockPlatformPackage;

-import com.android.sdklib.internal.repository.MockPlatformToolPackage;

-import com.android.sdklib.internal.repository.MockToolPackage;

-import com.android.sdklib.internal.repository.Package;

-import com.android.sdklib.internal.repository.SdkSource;

-import com.android.sdklib.internal.repository.SdkSources;

 import com.android.sdklib.internal.repository.DownloadCache;

+import com.android.sdklib.internal.repository.archives.Archive;

+import com.android.sdklib.internal.repository.packages.MockAddonPackage;

+import com.android.sdklib.internal.repository.packages.MockBrokenPackage;

+import com.android.sdklib.internal.repository.packages.MockPlatformPackage;

+import com.android.sdklib.internal.repository.packages.MockPlatformToolPackage;

+import com.android.sdklib.internal.repository.packages.MockToolPackage;

+import com.android.sdklib.internal.repository.packages.Package;

+import com.android.sdklib.internal.repository.sources.SdkSource;

+import com.android.sdklib.internal.repository.sources.SdkSources;

 import com.android.sdkuilib.internal.repository.icons.ImageFactory;

 

 import org.eclipse.swt.widgets.Shell;

diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java
index bc532a5..a328ef1 100755
--- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java
+++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java
@@ -17,18 +17,18 @@
 package com.android.sdkuilib.internal.repository.sdkman2;
 
 import com.android.sdklib.SdkConstants;
-import com.android.sdklib.internal.repository.BrokenPackage;
-import com.android.sdklib.internal.repository.MockAddonPackage;
-import com.android.sdklib.internal.repository.MockBrokenPackage;
-import com.android.sdklib.internal.repository.MockEmptyPackage;
-import com.android.sdklib.internal.repository.MockExtraPackage;
-import com.android.sdklib.internal.repository.MockPlatformPackage;
-import com.android.sdklib.internal.repository.MockPlatformToolPackage;
-import com.android.sdklib.internal.repository.MockSystemImagePackage;
-import com.android.sdklib.internal.repository.MockToolPackage;
-import com.android.sdklib.internal.repository.Package;
-import com.android.sdklib.internal.repository.SdkRepoSource;
-import com.android.sdklib.internal.repository.SdkSource;
+import com.android.sdklib.internal.repository.packages.BrokenPackage;
+import com.android.sdklib.internal.repository.packages.MockAddonPackage;
+import com.android.sdklib.internal.repository.packages.MockBrokenPackage;
+import com.android.sdklib.internal.repository.packages.MockEmptyPackage;
+import com.android.sdklib.internal.repository.packages.MockExtraPackage;
+import com.android.sdklib.internal.repository.packages.MockPlatformPackage;
+import com.android.sdklib.internal.repository.packages.MockPlatformToolPackage;
+import com.android.sdklib.internal.repository.packages.MockSystemImagePackage;
+import com.android.sdklib.internal.repository.packages.MockToolPackage;
+import com.android.sdklib.internal.repository.packages.Package;
+import com.android.sdklib.internal.repository.sources.SdkRepoSource;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdklib.repository.PkgProps;
 import com.android.sdkuilib.internal.repository.MockUpdaterData;