diff --git a/android-aac-enc/src/main/AndroidManifest.xml b/android-aac-enc/src/main/AndroidManifest.xml
index 6e89b76aa..e7160dd8d 100644
--- a/android-aac-enc/src/main/AndroidManifest.xml
+++ b/android-aac-enc/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.INTERNET"/>
-    
 
     <uses-sdk android:minSdkVersion="7" />
 
@@ -17,11 +16,6 @@
         <activity
             android:label="@string/app_name"
             android:name=".RecognizerApi$Main" >
-            <intent-filter >
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
     </application>
 
diff --git a/astrid/build.gradle b/astrid/build.gradle
index 0aa1e0894..d5e49e628 100644
--- a/astrid/build.gradle
+++ b/astrid/build.gradle
@@ -29,6 +29,18 @@ android {
             proguardFile getDefaultProguardFile('proguard-android.txt')
         }
     }
+
+    task nativeLibsToJar(type: Zip) {
+        destinationDir file("libs")
+        baseName 'libaac-encoder'
+        extension 'jar'
+        from fileTree(dir: '../android-aac-enc/libs/armeabi', include: 'libaac-encoder.so')
+        into 'lib/armeabi'
+    }
+
+    tasks.withType(Compile) {
+        compileTask -> compileTask.dependsOn(nativeLibsToJar)
+    }
 }
 
 dependencies {
@@ -36,7 +48,7 @@ dependencies {
     compile project(":android-aac-enc")
     compile project(":greendroid")
     compile project(":api")
-    compile fileTree(dir: "../libs", includes: ["*.jar"])
+    compile fileTree(dir: "libs", includes: ["*.jar"])
 
     compile group: 'com.google.guava', name: 'guava', version: '11.0.1', transitive: false
     compile group: 'com.google.code.gson', name: 'gson', version: '1.7.1', transitive: false
@@ -51,5 +63,4 @@ dependencies {
     compile group: 'com.google.http-client', name: 'google-http-client-extensions-android3', version: '1.6.0-beta', transitive: false
     compile group: 'com.google.oauth-client', name: 'google-oauth-client', version: '1.6.0-beta', transitive: false
     compile group: 'com.google.oauth-client', name: 'google-oauth-client-extensions', version: '1.6.0-beta', transitive: false
-
 }
diff --git a/libs/CWAC-SackOfViewsAdapter.jar b/astrid/libs/CWAC-SackOfViewsAdapter.jar
similarity index 100%
rename from libs/CWAC-SackOfViewsAdapter.jar
rename to astrid/libs/CWAC-SackOfViewsAdapter.jar
diff --git a/libs/framework.jar b/astrid/libs/framework.jar
similarity index 100%
rename from libs/framework.jar
rename to astrid/libs/framework.jar
diff --git a/libs/google-api-services-tasks-v1-1.3.0-beta-sources.jar b/astrid/libs/google-api-services-tasks-v1-1.3.0-beta-sources.jar
similarity index 100%
rename from libs/google-api-services-tasks-v1-1.3.0-beta-sources.jar
rename to astrid/libs/google-api-services-tasks-v1-1.3.0-beta-sources.jar
diff --git a/libs/google-api-services-tasks-v1-1.3.0-beta.jar b/astrid/libs/google-api-services-tasks-v1-1.3.0-beta.jar
similarity index 100%
rename from libs/google-api-services-tasks-v1-1.3.0-beta.jar
rename to astrid/libs/google-api-services-tasks-v1-1.3.0-beta.jar
diff --git a/libs/googleloginclient-helper.jar b/astrid/libs/googleloginclient-helper.jar
similarity index 100%
rename from libs/googleloginclient-helper.jar
rename to astrid/libs/googleloginclient-helper.jar
diff --git a/libs/jchronic-0.2.3.jar b/astrid/libs/jchronic-0.2.3.jar
similarity index 100%
rename from libs/jchronic-0.2.3.jar
rename to astrid/libs/jchronic-0.2.3.jar
diff --git a/libs/jsr305.jar b/astrid/libs/jsr305.jar
similarity index 100%
rename from libs/jsr305.jar
rename to astrid/libs/jsr305.jar
diff --git a/libs/locale_platform.jar b/astrid/libs/locale_platform.jar
similarity index 100%
rename from libs/locale_platform.jar
rename to astrid/libs/locale_platform.jar
diff --git a/libs/rfc2445-4Mar2011.jar b/astrid/libs/rfc2445-4Mar2011.jar
similarity index 100%
rename from libs/rfc2445-4Mar2011.jar
rename to astrid/libs/rfc2445-4Mar2011.jar