diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..287f673
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="android/src"/>
+	<classpathentry kind="lib" path="/Users/maf/Library/Application Support/Titanium/mobilesdk/osx/7.5.2.v20190314172321/android/titanium.jar"/>
+	<classpathentry kind="lib" path="/Users/maf/Library/Android/sdk/platforms/android-27/android.jar"/>
+	<classpathentry kind="lib" path="android/build/intermediates/exploded-aar/play-services-measurement-api-16.3.0/classes.jar"/>
+	<classpathentry kind="lib" path="/Users/maf/Library/Application Support/Titanium/mobilesdk/osx/7.5.2.v20190314172321/android/kroll-apt.jar"/>
+	<classpathentry kind="lib" path="/Users/maf/Library/Application Support/Titanium/mobilesdk/osx/7.5.2.v20190314172321/android/kroll-common.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/android/build.gradle b/android/build.gradle
index 6f2980a..31b6e52 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-	compile 'com.google.firebase:firebase-analytics:16.3.0'
+	compile 'com.google.firebase:firebase-core:16.0.8'
 }
 
 configurations.all {
diff --git a/android/java-sources.txt b/android/java-sources.txt
index cef88f0..43d2f7c 100644
--- a/android/java-sources.txt
+++ b/android/java-sources.txt
@@ -1,18 +1,51 @@
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/compat/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/coreui/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/coreutils/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/design/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/exifinterface/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/fragment/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/graphics/drawable/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/graphics/drawable/animated/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/mediacompat/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/transition/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v4/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v7/appcompat/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v7/cardview/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v7/recyclerview/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/measurement/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/firebase/analytics/R.java"
-"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/ti/modules/titanium/ui/R.java"
\ No newline at end of file
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/java/firebase/analytics/TitaniumFirebaseAnalyticsBootstrap.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/compat/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/coreui/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/coreutils/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/design/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/exifinterface/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/fragment/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/graphics/drawable/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/graphics/drawable/animated/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/mediacompat/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/transition/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/v4/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/v7/appcompat/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/v7/cardview/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/android/support/v7/recyclerview/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/ads_identifier/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/analyticsservices/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/analyticsservices_app_library/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/appstate/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/audience/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/auth/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/auth/api/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/auth/api/phone/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/base/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/common/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/flags/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/gcm/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/identity/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/iid/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/location/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/location/places/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/maps/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/measurement/api/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/measurement/sdk/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/measurement/sdk/api/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/measurement_base/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/places_placereport/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/stats/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/tagmanager_legacy/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/tasks/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/wallet/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/analytics/connector/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/firebase_core/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/iid/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/iid/internal/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/measurement/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/measurement_impl/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/firebase/analytics/R.java"
+"/Users/maf/Spacious/Titanium_Studio_Workspace/titanium-firebase-analytics/android/build/generated/r/ti/modules/titanium/ui/R.java"
\ No newline at end of file
diff --git a/android/lib/firebase-analytics-16.3.0.aar b/android/lib/firebase-analytics-16.3.0.aar
deleted file mode 100644
index 572186a..0000000
Binary files a/android/lib/firebase-analytics-16.3.0.aar and /dev/null differ
diff --git a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java
index 61a9beb..1800a8a 100644
--- a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java
+++ b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java
@@ -14,14 +14,12 @@
 import org.appcelerator.kroll.KrollModule;
 
 import org.appcelerator.titanium.io.TiBaseFile;
-import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiBlob;
 import org.appcelerator.titanium.util.TiConvert;
 
 import android.os.Bundle;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
-import com.google.firebase.analytics.FirebaseAnalytics.Param;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/android/timodule.xml b/android/timodule.xml
index d3e9c10..83ea74b 100644
--- a/android/timodule.xml
+++ b/android/timodule.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:module xmlns:ti="http://ti.appcelerator.org" xmlns:android="http://schemas.android.com/apk/res/android">
-	<?xml version="1.0" encoding="UTF-8"?>
-	<ti:module xmlns:ti="http://ti.appcelerator.org" xmlns:android="http://schemas.android.com/apk/res/android">
-		<modules>
-			<!-- Require Firebase Core (https://github.com/hansemannn/titanium-firebase-core) -->
-			<module>firebase.core</module>
+	<modules>
+		<!-- Require Firebase Core (https://github.com/hansemannn/titanium-firebase-core) -->
+		<module platform="android">firebase.core</module>
 
-			<!-- Require Ti.PlayServices (https://github.com/appcelerator-modules/ti.playservices) -->
-			<module platform="android">ti.playservices</module>
-		</modules>
-	</ti:module>
+		<!-- Require Ti.PlayServices (https://github.com/appcelerator-modules/ti.playservices) -->
+		<module platform="android">ti.playservices</module>
+	</modules>
 </ti:module>