diff --git a/Paco/project.properties b/Paco/project.properties
index 3d544da43..bad34948b 100644
--- a/Paco/project.properties
+++ b/Paco/project.properties
@@ -10,5 +10,4 @@
 # Project target.
 target=Google Inc.:Google APIs:22
 android.library.reference.1=../AndroidCompatSupport/v7/appcompat
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-android.library.reference.2=../../../Documents/projects/gitpaco/workspace/appcompat_v7
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
\ No newline at end of file
diff --git a/Paco/src/com/pacoapp/paco/utils/AndroidLocaleHelper.java b/Paco/src/com/pacoapp/paco/utils/AndroidLocaleHelper.java
index 8d567481b..45c9d6668 100644
--- a/Paco/src/com/pacoapp/paco/utils/AndroidLocaleHelper.java
+++ b/Paco/src/com/pacoapp/paco/utils/AndroidLocaleHelper.java
@@ -2,7 +2,7 @@
 
 import java.util.Locale;
 
-import com.google.paco.shared.client.LocaleHelper;
+import com.pacoapp.paco.shared.client.LocaleHelper;
 
 public abstract class AndroidLocaleHelper<T> extends LocaleHelper<T>{
 
@@ -15,6 +15,6 @@ public static String getLocale() {
     return Locale.getDefault().getLanguage();
   }
 
-  
+
 }
 
diff --git a/Shared/build.xml b/Shared/build.xml
index 6cb59f140..bb0f3899b 100644
--- a/Shared/build.xml
+++ b/Shared/build.xml
@@ -36,6 +36,10 @@
                 <exclude name="**/*.launch"/>
                 <exclude name="**/*.java"/>
             </fileset>
+            <fileset dir="src_non_j2objc">
+                <exclude name="**/*.launch"/>
+                <exclude name="**/*.java"/>
+            </fileset>
         </copy>
     </target>
     <target name="test-init" depends="init">
@@ -58,11 +62,15 @@
 			<fileset dir="src">
 				<include name="**/*.java" />
 			</fileset>
+			<fileset dir="src_non_j2objc">
+				<include name="**/*.java" />
+			</fileset>
 		</copy>
 
 		<javac debug="true" debuglevel="${debuglevel}" destdir="bin"
 			source="${source}" target="${target}">
 			<src path="src" />
+                        <src path="src_non_j2objc" />
 			<classpath refid="Shared.classpath" />
 
 		</javac>
@@ -76,6 +84,7 @@
         <sysproperty key="java.awt.headless" value="true" />
         <classpath>
           <pathelement location="src" />
+          <pathelement location="src_non_j2objc" />
           <pathelement location="test" />
           <path refid="Shared.classpath" />
           <pathelement location="testbin" />
diff --git a/build.xml b/build.xml
index 8827f271f..339ebc812 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project basedir="." default="build" name="Shared">
     <property environment="env"/>
-    <property name="PacoAndroidLib.location" value="PacoAndroidLib"/>
     <property name="PacoTest.location" value="PacoTest"/>
     <property name="Paco.location" value="Paco"/>
     <property name="Paco-Server.location" value="Paco-Server"/>
@@ -15,7 +14,6 @@
     <target name="clean">
         <ant antfile="build.xml" dir="${Shared.location}" inheritAll="false" target="clean"/>
         <ant antfile="build.xml" dir="${PacoTest.location}" inheritAll="false" target="clean"/>
-        <ant antfile="build.xml" dir="${PacoAndroidLib.location}" inheritAll="false" target="clean"/>
         <ant antfile="build.xml" dir="${Paco.location}" inheritAll="false" target="clean"/>
         <ant antfile="antbuild.xml" dir="${Paco-Server.location}" inheritAll="false" target="clean"/>
     </target>
@@ -26,12 +24,6 @@
     </subant>
   </target>
 
-  <target name="build-android-lib">
-    <subant target="debug">
-      <fileset dir="${PacoAndroidLib.location}" includes="build.xml"/>
-    </subant>
-  </target>
-
   <target name="build-android">
     <subant target="debug">
       <fileset dir="${Paco.location}" includes="build.xml"/>
@@ -68,7 +60,7 @@
     </target>
 
 
-    <target description="Build all projects." name="build" depends="copy-shared,build-android-lib,build-android,build-android-test,build-server">
+    <target description="Build all projects." name="build" depends="copy-shared,build-android,build-android-test,build-server">
     </target>