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

58 files changed, 313 insertions, 150 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
index fb7f0bf..8284054 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
@@ -25,11 +25,11 @@ import com.android.prefs.AndroidLocation.AndroidLocationException;
 import com.android.sdklib.AndroidVersion.AndroidVersionException;
 import com.android.sdklib.ISystemImage.LocationType;
 import com.android.sdklib.internal.project.ProjectProperties;
-import com.android.sdklib.internal.repository.Archive;
-import com.android.sdklib.internal.repository.ExtraPackage;
 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.archives.Archive;
+import com.android.sdklib.internal.repository.packages.ExtraPackage;
+import com.android.sdklib.internal.repository.packages.Package;
 import com.android.sdklib.repository.PkgProps;
 import com.android.util.Pair;
 
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java
index 29ea5ff..a4d1599 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java
@@ -23,8 +23,18 @@ import com.android.sdklib.ISystemImage;
 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

 import com.android.sdklib.ISystemImage.LocationType;

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

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

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

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

+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.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.SourcePackage;

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

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

 import com.android.util.Pair;

 

 import java.io.File;

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/UrlOpener.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/UrlOpener.java
index 69d232a..74b023e 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/UrlOpener.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/UrlOpener.java
@@ -55,7 +55,7 @@ import java.util.Map;
  * This class holds methods for adding URLs management.
  * @see #openUrl(String, ITaskMonitor, Header[])
  */
-class UrlOpener {
+public class UrlOpener {
 
     public static class CanceledByUserException extends Exception {
         private static final long serialVersionUID = -7669346110926032403L;
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/XmlParserUtils.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/XmlParserUtils.java
index 61b5b24..e4f2419 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/XmlParserUtils.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/XmlParserUtils.java
@@ -21,7 +21,7 @@ import org.w3c.dom.Node;
 /**

  * Misc utilities to help extracting elements and attributes out of an XML document.

  */

-class XmlParserUtils {

+public class XmlParserUtils {

 

     /**

      * Returns the first child element with the given XML local name.

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/Archive.java
index 617ba42..cd79275 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/Archive.java
@@ -14,10 +14,13 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.archives;

 

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

+import com.android.sdklib.internal.repository.IDescription;

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

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

 import com.android.sdklib.io.FileOp;

 

 import java.io.File;

@@ -190,7 +193,7 @@ public class Archive implements IDescription, Comparable<Archive> {
     /**

      * Creates a new remote archive.

      */

-    Archive(Package pkg, Os os, Arch arch, String url, long size, String checksum) {

+    public Archive(Package pkg, Os os, Arch arch, String url, long size, String checksum) {

         mPackage = pkg;

         mOs = os;

         mArch = arch;

@@ -206,7 +209,7 @@ public class Archive implements IDescription, Comparable<Archive> {
      * Uses the properties from props first, if possible. Props can be null.

      */

     @VisibleForTesting(visibility=Visibility.PACKAGE)

-    protected Archive(Package pkg, Properties props, Os os, Arch arch, String localOsPath) {

+    public Archive(Package pkg, Properties props, Os os, Arch arch, String localOsPath) {

         mPackage = pkg;

 

         mOs   = props == null ? os   : Os.valueOf(  props.getProperty(PROP_OS,   os.toString()));

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ArchiveInstaller.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java
index 53fc140..3addb31 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ArchiveInstaller.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java
@@ -14,12 +14,16 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.archives;

 

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

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

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

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

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

 import com.android.sdklib.io.FileOp;

 import com.android.sdklib.io.IFileOp;

 import com.android.sdklib.repository.RepoConstants;

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ArchiveReplacement.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveReplacement.java
index 6dcd9bb..10987fa 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ArchiveReplacement.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveReplacement.java
@@ -14,7 +14,10 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.archives;

+

+import com.android.sdklib.internal.repository.IDescription;

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

 

 

 /**

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java
index 606775f..cc35e54 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.annotations.NonNull;

 import com.android.annotations.VisibleForTesting;

@@ -24,8 +24,11 @@ import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.IAndroidTarget.IOptionalLibrary;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

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

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

+import com.android.sdklib.internal.repository.IDescription;

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

 import com.android.sdklib.repository.PkgProps;

 import com.android.sdklib.repository.SdkAddonConstants;

 import com.android.sdklib.repository.SdkRepoConstants;

@@ -126,7 +129,7 @@ public class AddonPackage extends Package
      *          parameters that vary according to the originating XML schema.

      * @param licenses The licenses loaded from the XML originating document.

      */

-    AddonPackage(

+    public AddonPackage(

             SdkSource source,

             Node packageNode,

             String nsUri,

@@ -207,7 +210,7 @@ public class AddonPackage extends Package
      * <p/>

      * By design, this creates a package with one and only one archive.

      */

-    static Package create(IAndroidTarget target, Properties props) {

+    public static Package create(IAndroidTarget target, Properties props) {

         return new AddonPackage(target, props);

     }

 

@@ -303,7 +306,7 @@ public class AddonPackage extends Package
      * @param addonProps The properties parsed from the addon manifest (NOT the source.properties).

      * @param error The error indicating why this addon failed to be loaded.

      */

-    static Package createBroken(

+    public static Package createBroken(

             String archiveOsPath,

             Properties sourceProps,

             Map<String, String> addonProps,

@@ -357,7 +360,7 @@ public class AddonPackage extends Package
      * These properties will later be given to a constructor that takes a {@link Properties} object.

      */

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         super.saveProperties(props);

 

         mVersion.saveProperties(props);

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/BrokenPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/BrokenPackage.java
index 3e6b2e9..6a7e9c6 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/BrokenPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/BrokenPackage.java
@@ -14,11 +14,14 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.sdklib.SdkManager;

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

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

+import com.android.sdklib.internal.repository.IDescription;

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

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

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

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

 

 import java.io.File;

 import java.util.Properties;

@@ -81,7 +84,7 @@ public class BrokenPackage extends Package
      * Base implementation override: We don't actually save properties for a broken package.

      */

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         // Nop. We don't actually save properties for a broken package.

     }

 

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DocPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/DocPackage.java
index 2c78cd1..54dfc5e 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DocPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/DocPackage.java
@@ -14,13 +14,16 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.sdklib.AndroidVersion;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

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

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

+import com.android.sdklib.internal.repository.IDescription;

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

 import com.android.sdklib.repository.SdkRepoConstants;

 

 import org.w3c.dom.Node;

@@ -50,7 +53,7 @@ public class DocPackage extends Package implements IPackageVersion {
      *          parameters that vary according to the originating XML schema.

      * @param licenses The licenses loaded from the XML originating document.

      */

-    DocPackage(SdkSource source, Node packageNode, String nsUri, Map<String,String> licenses) {

+    public DocPackage(SdkSource source, Node packageNode, String nsUri, Map<String,String> licenses) {

         super(source, packageNode, nsUri, licenses);

 

         int apiLevel = XmlParserUtils.getXmlInt   (packageNode, SdkRepoConstants.NODE_API_LEVEL, 0);

@@ -68,7 +71,7 @@ public class DocPackage extends Package implements IPackageVersion {
      * <p/>

      * By design, this creates a package with one and only one archive.

      */

-    static Package create(SdkSource source,

+    public static Package create(SdkSource source,

             Properties props,

             int apiLevel,

             String codename,

@@ -111,7 +114,7 @@ public class DocPackage extends Package implements IPackageVersion {
      * These properties will later be give the constructor that takes a {@link Properties} object.

      */

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         super.saveProperties(props);

 

         mVersion.saveProperties(props);

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ExtraPackage.java
index 4e922c5..cc27853 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ExtraPackage.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.annotations.Nullable;

 import com.android.annotations.VisibleForTesting;

@@ -22,8 +22,14 @@ import com.android.annotations.VisibleForTesting.Visibility;
 import com.android.sdklib.NullSdkLog;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

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

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

+import com.android.sdklib.internal.repository.IDescription;

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

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

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

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

 import com.android.sdklib.repository.PkgProps;

 import com.android.sdklib.repository.RepoConstants;

 

@@ -90,7 +96,7 @@ public class ExtraPackage extends MinToolsPackage
      *          parameters that vary according to the originating XML schema.

      * @param licenses The licenses loaded from the XML originating document.

      */

-    ExtraPackage(

+    public ExtraPackage(

             SdkSource source,

             Node packageNode,

             String nsUri,

@@ -173,7 +179,7 @@ public class ExtraPackage extends MinToolsPackage
      * <p/>

      * By design, this creates a package with one and only one archive.

      */

-    static Package create(SdkSource source,

+    public static Package create(SdkSource source,

             Properties props,

             String vendor,

             String path,

@@ -271,7 +277,7 @@ public class ExtraPackage extends MinToolsPackage
      * These properties will later be give the constructor that takes a {@link Properties} object.

      */

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         super.saveProperties(props);

 

         props.setProperty(PkgProps.EXTRA_PATH, mPath);

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IExactApiLevelDependency.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IExactApiLevelDependency.java
index 2a0130c..eaeccdb 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IExactApiLevelDependency.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IExactApiLevelDependency.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.repository.RepoConstants;
 
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ILayoutlibVersion.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ILayoutlibVersion.java
index eb57343..74b18bf 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ILayoutlibVersion.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ILayoutlibVersion.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.util.Pair;

 

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IMinApiLevelDependency.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinApiLevelDependency.java
index e23f3b6..8baafe9 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IMinApiLevelDependency.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinApiLevelDependency.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.repository.SdkRepoConstants;
 
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IMinPlatformToolsDependency.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinPlatformToolsDependency.java
index c536b3e..32468a4 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IMinPlatformToolsDependency.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinPlatformToolsDependency.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.repository.SdkRepoConstants;
 
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IMinToolsDependency.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinToolsDependency.java
index 2f0b8fa..76cdd66 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IMinToolsDependency.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinToolsDependency.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.repository.SdkRepoConstants;
 
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IPackageVersion.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IPackageVersion.java
index 911ba8d..77a6a1d 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IPackageVersion.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IPackageVersion.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.sdklib.AndroidVersion;

 

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IPlatformDependency.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IPlatformDependency.java
index 3aba333..a61fbea 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IPlatformDependency.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IPlatformDependency.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.AndroidVersion;
 
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LayoutlibVersionMixin.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/LayoutlibVersionMixin.java
index eb819d7..5b582c1 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LayoutlibVersionMixin.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/LayoutlibVersionMixin.java
@@ -14,8 +14,9 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

+import com.android.sdklib.internal.repository.XmlParserUtils;

 import com.android.sdklib.repository.PkgProps;

 import com.android.sdklib.repository.RepoConstants;

 import com.android.util.Pair;

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/MinToolsPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/MinToolsPackage.java
index 9a9f416..99602c8 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/MinToolsPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/MinToolsPackage.java
@@ -14,10 +14,12 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

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

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

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

 import com.android.sdklib.repository.PkgProps;

 import com.android.sdklib.repository.SdkRepoConstants;

 

@@ -93,7 +95,7 @@ public abstract class MinToolsPackage extends Package implements IMinToolsDepend
     }

 

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         super.saveProperties(props);

 

         if (getMinToolsRevision() != MIN_TOOLS_REV_NOT_SPECIFIED) {

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/Package.java
index a86171c..0e2b615 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/Package.java
@@ -14,15 +14,22 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

 import com.android.sdklib.AndroidVersion;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

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

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

+import com.android.sdklib.internal.repository.IDescription;

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

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

+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.io.IFileOp;

 import com.android.sdklib.repository.PkgProps;

 import com.android.sdklib.repository.SdkAddonConstants;

@@ -214,7 +221,7 @@ public abstract class Package implements IDescription, Comparable<Package> {
      * Save the properties of the current packages in the given {@link Properties} object.

      * These properties will later be give the constructor that takes a {@link Properties} object.

      */

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         props.setProperty(PkgProps.PKG_REVISION, Integer.toString(mRevision));

         if (mLicense != null && mLicense.length() > 0) {

             props.setProperty(PkgProps.PKG_LICENSE, mLicense);

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PlatformPackage.java
index 937a4b4..391c32e 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PlatformPackage.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

@@ -22,8 +22,11 @@ import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.IAndroidTarget;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

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

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

+import com.android.sdklib.internal.repository.IDescription;

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

 import com.android.sdklib.repository.PkgProps;

 import com.android.sdklib.repository.SdkRepoConstants;

 import com.android.util.Pair;

@@ -61,7 +64,7 @@ public class PlatformPackage extends MinToolsPackage implements IPackageVersion,
      *          parameters that vary according to the originating XML schema.

      * @param licenses The licenses loaded from the XML originating document.

      */

-    PlatformPackage(SdkSource source, Node packageNode, String nsUri, Map<String,String> licenses) {

+    public PlatformPackage(SdkSource source, Node packageNode, String nsUri, Map<String,String> licenses) {

         super(source, packageNode, nsUri, licenses);

 

         mVersionName = XmlParserUtils.getXmlString(packageNode, SdkRepoConstants.NODE_VERSION);

@@ -87,7 +90,7 @@ public class PlatformPackage extends MinToolsPackage implements IPackageVersion,
      * <p/>

      * By design, this creates a package with one and only one archive.

      */

-    static Package create(IAndroidTarget target, Properties props) {

+    public static Package create(IAndroidTarget target, Properties props) {

         return new PlatformPackage(target, props);

     }

 

@@ -120,7 +123,7 @@ public class PlatformPackage extends MinToolsPackage implements IPackageVersion,
      * These properties will later be given to a constructor that takes a {@link Properties} object.

      */

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         super.saveProperties(props);

 

         mVersion.saveProperties(props);

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformToolPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PlatformToolPackage.java
index 33fb8ee..6070593 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformToolPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PlatformToolPackage.java
@@ -14,14 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.annotations.VisibleForTesting;
 import com.android.annotations.VisibleForTesting.Visibility;
 import com.android.sdklib.SdkConstants;
 import com.android.sdklib.SdkManager;
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.AdbWrapper;
+import com.android.sdklib.internal.repository.IDescription;
+import com.android.sdklib.internal.repository.ITaskMonitor;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 
 import org.w3c.dom.Node;
 
@@ -49,7 +54,7 @@ public class PlatformToolPackage extends Package {
      *          parameters that vary according to the originating XML schema.
      * @param licenses The licenses loaded from the XML originating document.
      */
-    PlatformToolPackage(SdkSource source, Node packageNode,
+    public PlatformToolPackage(SdkSource source, Node packageNode,
             String nsUri, Map<String,String> licenses) {
         super(source, packageNode, nsUri, licenses);
     }
@@ -61,7 +66,7 @@ public class PlatformToolPackage extends Package {
      * <p/>
      * By design, this creates a package with one and only one archive.
      */
-    static Package create(
+    public static Package create(
             SdkSource source,
             Properties props,
             int revision,
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SamplePackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SamplePackage.java
index 9b2daf7..ed5eda5 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SamplePackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SamplePackage.java
@@ -14,15 +14,20 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.sdklib.AndroidVersion;

 import com.android.sdklib.AndroidVersion.AndroidVersionException;

 import com.android.sdklib.IAndroidTarget;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

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

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

+import com.android.sdklib.internal.repository.IDescription;

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

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

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

 import com.android.sdklib.io.IFileOp;

 import com.android.sdklib.repository.PkgProps;

 import com.android.sdklib.repository.SdkRepoConstants;

@@ -65,7 +70,7 @@ public class SamplePackage extends MinToolsPackage
      *          parameters that vary according to the originating XML schema.

      * @param licenses The licenses loaded from the XML originating document.

      */

-    SamplePackage(SdkSource source, Node packageNode, String nsUri, Map<String,String> licenses) {

+    public SamplePackage(SdkSource source, Node packageNode, String nsUri, Map<String,String> licenses) {

         super(source, packageNode, nsUri, licenses);

 

         int apiLevel = XmlParserUtils.getXmlInt   (packageNode, SdkRepoConstants.NODE_API_LEVEL, 0);

@@ -92,7 +97,7 @@ public class SamplePackage extends MinToolsPackage
      * <p/>

      * By design, this creates a package with one and only one archive.

      */

-    static Package create(IAndroidTarget target, Properties props) {

+    public static Package create(IAndroidTarget target, Properties props) {

         return new SamplePackage(target, props);

     }

 

@@ -128,7 +133,7 @@ public class SamplePackage extends MinToolsPackage
      * @throws AndroidVersionException if the {@link AndroidVersion} can't be restored

      *                                 from properties.

      */

-    static Package create(String archiveOsPath, Properties props) throws AndroidVersionException {

+    public static Package create(String archiveOsPath, Properties props) throws AndroidVersionException {

         return new SamplePackage(archiveOsPath, props);

     }

 

@@ -157,7 +162,7 @@ public class SamplePackage extends MinToolsPackage
      * These properties will later be given to a constructor that takes a {@link Properties} object.

      */

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         super.saveProperties(props);

 

         mVersion.saveProperties(props);

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SourcePackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SourcePackage.java
index 1eb00e1..2c577e4 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SourcePackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SourcePackage.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

@@ -22,8 +22,13 @@ import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.AndroidVersion.AndroidVersionException;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

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

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

+import com.android.sdklib.internal.repository.IDescription;

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

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

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

 import com.android.sdklib.io.IFileOp;

 import com.android.sdklib.repository.SdkRepoConstants;

 

@@ -56,7 +61,7 @@ public class SourcePackage extends Package implements IPackageVersion {
      *          parameters that vary according to the originating XML schema.

      * @param licenses The licenses loaded from the XML originating document.

      */

-    SourcePackage(SdkSource source,

+    public SourcePackage(SdkSource source,

             Node packageNode,

             String nsUri,

             Map<String,String> licenses) {

@@ -171,7 +176,7 @@ public class SourcePackage extends Package implements IPackageVersion {
      * These properties will later be given to a constructor that takes a {@link Properties} object.

      */

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         super.saveProperties(props);

         mVersion.saveProperties(props);

     }

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SystemImagePackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SystemImagePackage.java
index a246584..c862882 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SystemImagePackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SystemImagePackage.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

@@ -23,8 +23,11 @@ import com.android.sdklib.AndroidVersion.AndroidVersionException;
 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

 import com.android.sdklib.SystemImage;

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

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

+import com.android.sdklib.internal.repository.IDescription;

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

 import com.android.sdklib.repository.PkgProps;

 import com.android.sdklib.repository.SdkRepoConstants;

 

@@ -57,7 +60,7 @@ public class SystemImagePackage extends Package
      *          parameters that vary according to the originating XML schema.

      * @param licenses The licenses loaded from the XML originating document.

      */

-    SystemImagePackage(SdkSource source,

+    public SystemImagePackage(SdkSource source,

             Node packageNode,

             String nsUri,

             Map<String,String> licenses) {

@@ -74,7 +77,7 @@ public class SystemImagePackage extends Package
     }

 

     @VisibleForTesting(visibility=Visibility.PRIVATE)

-    protected SystemImagePackage(

+    public SystemImagePackage(

             AndroidVersion platformVersion,

             int revision,

             String abi,

@@ -185,7 +188,7 @@ public class SystemImagePackage extends Package
      * These properties will later be given to a constructor that takes a {@link Properties} object.

      */

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         super.saveProperties(props);

 

         mVersion.saveProperties(props);

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ToolPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ToolPackage.java
index 3ddacb4..e4a8fe6 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ToolPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ToolPackage.java
@@ -14,14 +14,19 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SdkManager;

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

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

+import com.android.sdklib.internal.repository.IDescription;

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

+import com.android.sdklib.internal.repository.XmlParserUtils;

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

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

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

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

 import com.android.sdklib.repository.SdkRepoConstants;

 import com.android.sdklib.util.GrabProcessOutput;

 import com.android.sdklib.util.GrabProcessOutput.IProcessOutput;

@@ -43,7 +48,7 @@ public class ToolPackage extends Package implements IMinPlatformToolsDependency
     /** The value returned by {@link ToolPackage#installId()}. */

     public static final String INSTALL_ID = "tools";                             //$NON-NLS-1$

 

-    protected static final String PROP_MIN_PLATFORM_TOOLS_REV =

+    public static final String PROP_MIN_PLATFORM_TOOLS_REV =

                                                 "Platform.MinPlatformToolsRev";  //$NON-NLS-1$

 

     /**

@@ -62,7 +67,7 @@ public class ToolPackage extends Package implements IMinPlatformToolsDependency
      *          parameters that vary according to the originating XML schema.

      * @param licenses The licenses loaded from the XML originating document.

      */

-    ToolPackage(SdkSource source, Node packageNode, String nsUri, Map<String,String> licenses) {

+    public ToolPackage(SdkSource source, Node packageNode, String nsUri, Map<String,String> licenses) {

         super(source, packageNode, nsUri, licenses);

 

         mMinPlatformToolsRevision = XmlParserUtils.getXmlInt(

@@ -102,7 +107,7 @@ public class ToolPackage extends Package implements IMinPlatformToolsDependency
      * <p/>

      * By design, this creates a package with one and only one archive.

      */

-    static Package create(

+    public static Package create(

             SdkSource source,

             Properties props,

             int revision,

@@ -226,7 +231,7 @@ public class ToolPackage extends Package implements IMinPlatformToolsDependency
     }

 

     @Override

-    void saveProperties(Properties props) {

+    public void saveProperties(Properties props) {

         super.saveProperties(props);

 

         if (getMinPlatformToolsRevision() != MIN_PLATFORM_TOOLS_REV_INVALID) {

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkAddonSource.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkAddonSource.java
index 42f7603..39a134b 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkAddonSource.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkAddonSource.java
@@ -14,9 +14,10 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.sources;

 

 import com.android.annotations.Nullable;

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

 import com.android.sdklib.repository.SdkAddonConstants;

 

 import org.w3c.dom.Document;

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkRepoSource.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkRepoSource.java
index 00392de..07c3a86 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkRepoSource.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkRepoSource.java
@@ -14,11 +14,13 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.sources;

 

 import com.android.annotations.Nullable;

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

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

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

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

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

+import com.android.sdklib.internal.repository.XmlParserUtils;

 import com.android.sdklib.repository.RepoConstants;

 import com.android.sdklib.repository.SdkRepoConstants;

 

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSource.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSource.java
index 749bc01..45646f0 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSource.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSource.java
@@ -14,12 +14,26 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.sources;

 

 import com.android.annotations.Nullable;

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

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

+import com.android.sdklib.internal.repository.IDescription;

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

+import com.android.sdklib.internal.repository.UrlOpener;

 import com.android.sdklib.internal.repository.UrlOpener.CanceledByUserException;

+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.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.SourcePackage;

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

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

 import com.android.sdklib.repository.RepoConstants;

 import com.android.sdklib.repository.SdkAddonConstants;

 import com.android.sdklib.repository.SdkRepoConstants;

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSourceCategory.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSourceCategory.java
index 546e991..fac2c8b 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSourceCategory.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSourceCategory.java
@@ -14,7 +14,9 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.sources;

+

+import com.android.sdklib.internal.repository.IDescription;

 

 

 /**

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSourceProperties.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSourceProperties.java
index 7f7b8c2..915dc36 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSourceProperties.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSourceProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.sources;

 

 import com.android.annotations.NonNull;

 import com.android.annotations.Nullable;

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSources.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSources.java
index dc33966..b1354c3 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSources.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSources.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.sources;

 

 import com.android.prefs.AndroidLocation;

 import com.android.prefs.AndroidLocation.AndroidLocationException;

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkAddonConstants.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkAddonConstants.java
index 41b184e..52d3a14 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkAddonConstants.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkAddonConstants.java
@@ -17,7 +17,7 @@
 package com.android.sdklib.repository;

 

 

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

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

 

 import java.io.InputStream;

 

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepoConstants.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepoConstants.java
index b4a75a9..258ea26 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepoConstants.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepoConstants.java
@@ -17,7 +17,7 @@
 package com.android.sdklib.repository;

 

 

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

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

 

 import java.io.InputStream;

 

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java
index 903a276..f0d7565 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java
@@ -30,7 +30,7 @@ import java.util.Map;
  * A mock PlatformTarget.

  * This reimplements the minimum needed from the interface for our limited testing needs.

  */

-class MockPlatformTarget implements IAndroidTarget {

+public class MockPlatformTarget implements IAndroidTarget {

 

     private final int mApiLevel;

     private final int mRevision;

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/ArchiveInstallerTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/archives/ArchiveInstallerTest.java
index 8f42f8a..3f70d79 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/ArchiveInstallerTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/archives/ArchiveInstallerTest.java
@@ -14,10 +14,23 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
-
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+package com.android.sdklib.internal.repository.archives;
+
+import com.android.sdklib.internal.repository.DownloadCache;
+import com.android.sdklib.internal.repository.ITaskMonitor;
+import com.android.sdklib.internal.repository.MockEmptySdkManager;
+import com.android.sdklib.internal.repository.MockMonitor;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.archives.ArchiveInstaller;
+import com.android.sdklib.internal.repository.archives.ArchiveReplacement;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.packages.ExtraPackage;
+import com.android.sdklib.internal.repository.packages.MockEmptyPackage;
+import com.android.sdklib.internal.repository.packages.MockExtraPackage;
+import com.android.sdklib.internal.repository.packages.ToolPackage;
+import com.android.sdklib.internal.repository.sources.SdkRepoSource;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdklib.io.IFileOp;
 import com.android.sdklib.io.MockFileOp;
 import com.android.sdklib.repository.PkgProps;
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/ArchiveTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/archives/ArchiveTest.java
index f6bd5a4..c0ae718 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/ArchiveTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/archives/ArchiveTest.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.archives;
 
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
 
 import junit.framework.TestCase;
 
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/BrokenPackageTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/BrokenPackageTest.java
index 03b1e1d..92a04c4 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/BrokenPackageTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/BrokenPackageTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
+
+import com.android.sdklib.internal.repository.packages.BrokenPackage;
 
 import junit.framework.TestCase;
 
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/ExtraPackageTest_v3.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v3.java
index c895fc9..6102f13 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/ExtraPackageTest_v3.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v3.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.packages.ExtraPackage;
 import com.android.sdklib.repository.PkgProps;
 
 import java.io.File;
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/ExtraPackageTest_v4.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v4.java
index 19e50f0..eff3020 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/ExtraPackageTest_v4.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v4.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.packages.ExtraPackage;
 import com.android.sdklib.repository.PkgProps;
 
 import java.io.File;
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MinToolsPackageTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MinToolsPackageTest.java
index 451bdb2..00986a4 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MinToolsPackageTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MinToolsPackageTest.java
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.SdkManager;
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.packages.MinToolsPackage;
+import com.android.sdklib.internal.repository.packages.Package;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdklib.repository.PkgProps;
 
 import java.io.File;
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockAddonPackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockAddonPackage.java
index 3953f79..40d563f 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockAddonPackage.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockAddonPackage.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.sdklib.AndroidVersion;

 import com.android.sdklib.IAndroidTarget;

@@ -22,6 +22,8 @@ import com.android.sdklib.ISystemImage;
 import com.android.sdklib.ISystemImage.LocationType;

 import com.android.sdklib.SdkConstants;

 import com.android.sdklib.SystemImage;

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

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

 import com.android.sdklib.io.FileOp;

 import com.android.sdklib.repository.PkgProps;

 

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockBrokenPackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockBrokenPackage.java
index 9ea9dfa..e4b307b 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockBrokenPackage.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockBrokenPackage.java
@@ -14,7 +14,9 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

+

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

 

 

 /**

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockEmptyPackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockEmptyPackage.java
index 7fdee5b..f1e4344 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockEmptyPackage.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockEmptyPackage.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.SdkManager;
-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.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.packages.Package;
+import com.android.sdklib.internal.repository.sources.SdkSource;
 
 import java.io.File;
 import java.util.Properties;
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockExtraPackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockExtraPackage.java
index 4011f3e..6225935 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockExtraPackage.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockExtraPackage.java
@@ -14,10 +14,13 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

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

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

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

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

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

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

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

 

 import java.util.Properties;

 

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformPackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockPlatformPackage.java
index 8313b8a..01181a1 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformPackage.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockPlatformPackage.java
@@ -14,9 +14,12 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.sdklib.IAndroidTarget;

+import com.android.sdklib.internal.repository.MockPlatformTarget;

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

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

 import com.android.sdklib.repository.PkgProps;

 

 import java.util.Properties;

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformToolPackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockPlatformToolPackage.java
index 788fdf7..fc01b3c 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformToolPackage.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockPlatformToolPackage.java
@@ -14,10 +14,12 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

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

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

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

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

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

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

 

 /**

  * A mock {@link PlatformToolPackage} for testing.

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockSourcePackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockSourcePackage.java
index ea65566..585ca2e 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockSourcePackage.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockSourcePackage.java
@@ -14,9 +14,12 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

 import com.android.sdklib.AndroidVersion;

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

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

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

 

 

 /**

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockSystemImagePackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockSystemImagePackage.java
index 3237fbb..534dad8 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockSystemImagePackage.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockSystemImagePackage.java
@@ -14,7 +14,10 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

+

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

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

 

 

 /**

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockToolPackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockToolPackage.java
index 7cbf802..e1da422 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockToolPackage.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockToolPackage.java
@@ -14,10 +14,12 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.packages;

 

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

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

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

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

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

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

 

 import java.util.Properties;

 

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/PackageTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/PackageTest.java
index 5cf1c98..ce41a4d 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/PackageTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/PackageTest.java
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.SdkManager;
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.packages.BrokenPackage;
+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 java.io.File;
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/PlatformPackageTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/PlatformPackageTest.java
index e657425..a0b4ab7 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/PlatformPackageTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/PlatformPackageTest.java
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.IAndroidTarget;
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.MockPlatformTarget;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.packages.PlatformPackage;
 import com.android.sdklib.repository.PkgProps;
 
 import java.util.Properties;
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SourcePackageTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/SourcePackageTest.java
index 2311feb..66f37dc 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SourcePackageTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/SourcePackageTest.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.AndroidVersion.AndroidVersionException;
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.packages.SourcePackage;
 import com.android.sdklib.repository.PkgProps;
 
 import java.util.Properties;
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SystemImagePackageTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/SystemImagePackageTest.java
index e6f0a2d..14e1c3e 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SystemImagePackageTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/SystemImagePackageTest.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.packages;
 
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.AndroidVersion.AndroidVersionException;
-import com.android.sdklib.internal.repository.Archive.Arch;
-import com.android.sdklib.internal.repository.Archive.Os;
+import com.android.sdklib.internal.repository.archives.Archive;
+import com.android.sdklib.internal.repository.archives.Archive.Arch;
+import com.android.sdklib.internal.repository.archives.Archive.Os;
+import com.android.sdklib.internal.repository.packages.SystemImagePackage;
 import com.android.sdklib.repository.PkgProps;
 
 import java.util.Properties;
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkAddonSourceTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkAddonSourceTest.java
index 11626e6..b9a3436 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkAddonSourceTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkAddonSourceTest.java
@@ -14,9 +14,16 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.sources;

 

 import com.android.sdklib.SdkManager;

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

+import com.android.sdklib.internal.repository.MockEmptySdkManager;

+import com.android.sdklib.internal.repository.MockMonitor;

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

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

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

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

 import com.android.sdklib.repository.SdkAddonConstants;

 import com.android.util.Pair;

 

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkRepoSourceTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkRepoSourceTest.java
index 0659fc4..1bc9639 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkRepoSourceTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkRepoSourceTest.java
@@ -14,9 +14,20 @@
  * limitations under the License.

  */

 

-package com.android.sdklib.internal.repository;

+package com.android.sdklib.internal.repository.sources;

 

 import com.android.sdklib.SdkManager;

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

+import com.android.sdklib.internal.repository.MockEmptySdkManager;

+import com.android.sdklib.internal.repository.MockMonitor;

+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.SourcePackage;

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

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

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

 import com.android.sdklib.repository.SdkRepoConstants;

 import com.android.util.Pair;

 

diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkSourcePropertiesTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkSourcePropertiesTest.java
index b4aa2e5..6313e69 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkSourcePropertiesTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkSourcePropertiesTest.java
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.repository;
+package com.android.sdklib.internal.repository.sources;
 
 
+import com.android.sdklib.internal.repository.sources.SdkSourceProperties;
+
 import junit.framework.TestCase;
 
 public class SdkSourcePropertiesTest extends TestCase {