diff --git a/tools/sdkmanager/libs/sdklib/.classpath b/tools/sdkmanager/libs/sdklib/.classpath
index fc17a4307..050eeb261 100644
--- a/tools/sdkmanager/libs/sdklib/.classpath
+++ b/tools/sdkmanager/libs/sdklib/.classpath
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="tests"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tools/sdkmanager/app/src/com/android/sdkmanager/repository/SdkRepositoryConstants.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepositoryConstants.java
similarity index 93%
rename from tools/sdkmanager/app/src/com/android/sdkmanager/repository/SdkRepositoryConstants.java
rename to tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepositoryConstants.java
index f9119890c..d10808f2e 100755
--- a/tools/sdkmanager/app/src/com/android/sdkmanager/repository/SdkRepositoryConstants.java
+++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepositoryConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdkmanager.repository;
+package com.android.sdklib.repository;
 
 import java.io.InputStream;
 
diff --git a/tools/sdkmanager/app/src/com/android/sdkmanager/repository/sdk-repository.xsd b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository.xsd
similarity index 100%
rename from tools/sdkmanager/app/src/com/android/sdkmanager/repository/sdk-repository.xsd
rename to tools/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository.xsd
diff --git a/tools/sdkmanager/app/tests/com/android/sdkmanager/repository/TestXml.java b/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java
similarity index 89%
rename from tools/sdkmanager/app/tests/com/android/sdkmanager/repository/TestXml.java
rename to tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java
index 482ef2691..68b475ad5 100755
--- a/tools/sdkmanager/app/tests/com/android/sdkmanager/repository/TestXml.java
+++ b/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.sdkmanager.repository;
+package com.android.sdklib.repository;
+
+import com.android.sdklib.repository.SdkRepositoryConstants;
 
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -36,7 +38,7 @@ import junit.framework.TestCase;
  * References:
  * http://www.ibm.com/developerworks/xml/library/x-javaxmlvalidapi.html
  */
-public class TestXml extends TestCase {
+public class TestSdkRepository extends TestCase {
 
     @Override
     protected void setUp() throws Exception {
@@ -51,7 +53,7 @@ public class TestXml extends TestCase {
     public void testValidateLocalRepositoryFile() throws Exception {
 
         InputStream xsdStream = SdkRepositoryConstants.getXsdStream();
-        InputStream xmlStream = TestXml.class.getResourceAsStream("repository_sample.xml");
+        InputStream xmlStream = TestSdkRepository.class.getResourceAsStream("repository_sample.xml");
 
         SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
 
diff --git a/tools/sdkmanager/app/tests/com/android/sdkmanager/repository/repository_sample.xml b/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/repository_sample.xml
similarity index 100%
rename from tools/sdkmanager/app/tests/com/android/sdkmanager/repository/repository_sample.xml
rename to tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/repository_sample.xml