diff --git a/.gitignore b/.gitignore
index 3c0bf20..aea9322 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,13 @@ tmp
 bin
 build
 libs
-dist
-*.zip
+# dist
+# *.zip
 
 .classpath
 
 xcuserdata
-build.properties
+# build.properties
 
 Thumbs.db
 .DS_Store
diff --git a/.project b/.project
new file mode 100644
index 0000000..cfc08cd
--- /dev/null
+++ b/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>titanium-google-analytics</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.appcelerator.titanium.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.appcelerator.titanium.mobile.module.nature</nature>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+</projectDescription>
diff --git a/android/build.properties b/android/build.properties
new file mode 100644
index 0000000..4ae7165
--- /dev/null
+++ b/android/build.properties
@@ -0,0 +1,9 @@
+titanium.sdk=/Users/Ant/Library/Application\ Support/Titanium/
+titanium.os=osx
+titanium.version=6.0.1.GA
+android.sdk=/Users/Ant/Library/Android/sdk
+android.ndk=/Users/ant/Developer/tools/android-ndk-r11c
+titanium.platform=${titanium.sdk}/mobilesdk/${titanium.os}/${titanium.version}/android
+android.platform=${android.sdk}/platforms/android-23
+# google.apis=${android.sdk}/add-ons/addon_google_apis_google_inc_8
+google.apis=${android.sdk}/add-ons/addon-google_apis-google-23
diff --git a/android/dist/analytics.google-android-4.0.0.zip b/android/dist/analytics.google-android-4.0.0.zip
new file mode 100644
index 0000000..d86306d
Binary files /dev/null and b/android/dist/analytics.google-android-4.0.0.zip differ
diff --git a/android/dist/analytics.google.jar b/android/dist/analytics.google.jar
new file mode 100644
index 0000000..ca632b7
Binary files /dev/null and b/android/dist/analytics.google.jar differ
diff --git a/android/lib/google-play-services-gcm+analytics.jar b/android/lib/google-play-services-gcm+analytics.jar
new file mode 100644
index 0000000..882a5d2
Binary files /dev/null and b/android/lib/google-play-services-gcm+analytics.jar differ
diff --git a/android/manifest b/android/manifest
index bf065cc..a5eb75b 100644
--- a/android/manifest
+++ b/android/manifest
@@ -2,9 +2,9 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.1.0
-apiversion: 2
-architectures: armeabi armeabi-v7a x86
+version: 4.0.0
+apiversion: 3
+architectures: armeabi-v7a x86
 description: Google Analytics for Titanium Appcelerator
 author: Matt Tuttle
 license: MIT
@@ -16,4 +16,4 @@ name: analytics.google
 moduleid: analytics.google
 guid: 6bdae9d9-4154-4d21-aacf-c0f95b193dae
 platform: android
-minsdk: 3.4.2
+minsdk: 6.0.0
diff --git a/android/platform/android/res/values/version.xml b/android/platform/android/res/values/version.xml
index 8a5844c..3cc9ee3 100644
--- a/android/platform/android/res/values/version.xml
+++ b/android/platform/android/res/values/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="google_play_services_version">6171000</integer>
+    <integer name="google_play_services_version">8487000</integer>
 </resources>
\ No newline at end of file
diff --git a/assets/README b/assets/README
deleted file mode 100644
index ea55153..0000000
--- a/assets/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Place your assets like PNG files in this directory and they will be packaged
-with your module.
-
-All JavaScript files in the assets directory are IGNORED except if you create a
-file named "analytics.google.js" in this directory in which case it will be
-wrapped by native code, compiled, and used as your module. This allows you to
-run pure JavaScript modules that are pre-compiled.
-
-Note: Mobile Web does not support this assets directory.
diff --git a/gps-jars/google-play-services-gcm+analytics-version-8487000.jar b/gps-jars/google-play-services-gcm+analytics-version-8487000.jar
new file mode 100644
index 0000000..882a5d2
Binary files /dev/null and b/gps-jars/google-play-services-gcm+analytics-version-8487000.jar differ
diff --git a/android/lib/google-play-services.jar b/gps-jars/google-play-services-version-6171000.jar
similarity index 100%
rename from android/lib/google-play-services.jar
rename to gps-jars/google-play-services-version-6171000.jar