properly gradle and mavenized
diff --git a/.gitignore b/.gitignore
index a196304..6bab7f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,44 @@
-# Mac crap
-.DS_Store
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+/local.properties

-# intellij
-.idea
+# Eclipse
+.classpath
+.project
+.settings
+
+# Android Studio (InteliJ)
+.idea/
+/.idea/workspace.xml
 *.iml
+*.iws
+*.ipr
+/*/out
+/*/build
+/*/*/production
+
+#Gradle
+.gradletasknamecache
+.gradle/
+build/
+bin/

-out
-javadocs
\ No newline at end of file
+#Crashlytics
+com_crashlytics_export_strings.xml
+
+#OSx
+.DS_Store
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..6b4e870
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,50 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.10.+'
+        classpath 'org.robolectric.gradle:gradle-android-test-plugin:0.10.+'
+    }
+}
+
+apply plugin: 'android-library'
+apply plugin: 'android-test'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "19.0.3"
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 19
+        versionCode = VERSION_CODE
+        versionName = VERSION_NAME
+        packageName "io.keen"
+    }
+
+    sourceSets {
+        main.setRoot('src/main')
+        androidTest.setRoot('src/test')
+    }
+
+    androidTest {
+        include '**/*Test.class'
+        exclude '**/espresso/**/*.class'
+    }
+}
+
+dependencies {
+    repositories {
+        mavenCentral()
+    }
+
+    compile 'com.fasterxml.jackson.core:jackson-core:2.3.+',
+            'com.fasterxml.jackson.core:jackson-annotations:2.3.+',
+            'com.fasterxml.jackson.core:jackson-databind:2.3.+'
+
+    androidTestCompile 'junit:junit:4.11'
+    androidTestCompile 'org.mockito:mockito-all:1.9.+'
+}
+
+apply from: file("${project.rootDir}/gradle/gradle-mvn-publish.gradle")
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..915cdef
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,18 @@
+VERSION_NAME=1.1.0-SNAPSHOT
+VERSION_CODE=1
+GROUP=io.keen
+
+POM_DESCRIPTION=Official Android SDK for the Keen IO API. Build analytics features directly into your Android apps.
+POM_URL=https://keen.io/docs/
+POM_SCM_URL=https://github.com/keenlabs/KeenClient-Android
+POM_SCM_CONNECTION=scm:git@github.com:keenlabs/KeenClient-Android.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:keenlabs/KeenClient-Android.git
+POM_LICENCE_NAME=The MIT License
+POM_LICENCE_URL=https://github.com/keenlabs/KeenClient-Android/blob/master/LICENSE.txt
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=keenlabs
+POM_DEVELOPER_NAME=Keen IO
+
+POM_NAME=KeenClient Android
+POM_ARTIFACT_ID=keen-client-api-android
+POM_PACKAGING=jar
\ No newline at end of file
diff --git a/gradle/gradle-mvn-publish.gradle b/gradle/gradle-mvn-publish.gradle
new file mode 100644
index 0000000..eb52895
--- /dev/null
+++ b/gradle/gradle-mvn-publish.gradle
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2013 Chris Banes
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+def isReleaseBuild() {
+    return VERSION_NAME.contains("SNAPSHOT") == false
+}
+
+def getReleaseRepositoryUrl() {
+    return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
+            : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+}
+
+def getSnapshotRepositoryUrl() {
+    return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
+            : "https://oss.sonatype.org/content/repositories/snapshots/"
+}
+
+def getRepositoryUsername() {
+    return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
+}
+
+def getRepositoryPassword() {
+    return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
+}
+
+// Adds Jar Task if you set your packaging to jar
+if (POM_PACKAGING.equals("jar")) {
+    android.libraryVariants.all { variant ->
+        def name = variant.buildType.name
+        def task = project.tasks.create "jar${name.capitalize()}", Jar
+        task.dependsOn variant.javaCompile
+        task.from variant.javaCompile.destinationDir
+        artifacts.add('archives', task);
+    }
+}
+
+afterEvaluate { project ->
+    uploadArchives {
+        repositories {
+            mavenDeployer {
+                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+                pom.groupId = GROUP
+                pom.artifactId = POM_ARTIFACT_ID
+                pom.version = VERSION_NAME
+
+                repository(url: getReleaseRepositoryUrl()) {
+                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
+                }
+                snapshotRepository(url: getSnapshotRepositoryUrl()) {
+                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
+                }
+
+                pom.project {
+                    name POM_NAME
+                    packaging POM_PACKAGING
+                    description POM_DESCRIPTION
+                    url POM_URL
+
+                    scm {
+                        url POM_SCM_URL
+                        connection POM_SCM_CONNECTION
+                        developerConnection POM_SCM_DEV_CONNECTION
+                    }
+
+                    licenses {
+                        license {
+                            name POM_LICENCE_NAME
+                            url POM_LICENCE_URL
+                            distribution POM_LICENCE_DIST
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id POM_DEVELOPER_ID
+                            name POM_DEVELOPER_NAME
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    signing {
+        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+        sign configurations.archives
+    }
+
+    task androidJavadocs(type: Javadoc) {
+        failOnError false
+        source = android.sourceSets.main.allJava
+        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    }
+
+    task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+        classifier = 'javadoc'
+        from androidJavadocs.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.allSource
+    }
+
+    artifacts {
+        archives androidSourcesJar
+        archives androidJavadocsJar
+    }
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..0087cd3
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..6244385
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed May 14 18:09:32 BST 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/libs/jackson-annotations-2.1.0-sources.jar b/libs/jackson-annotations-2.1.0-sources.jar
deleted file mode 100644
index 93f8b0d..0000000
Binary files a/libs/jackson-annotations-2.1.0-sources.jar and /dev/null differ
diff --git a/libs/jackson-annotations-2.1.0.jar b/libs/jackson-annotations-2.1.0.jar
deleted file mode 100644
index e4ca559..0000000
Binary files a/libs/jackson-annotations-2.1.0.jar and /dev/null differ
diff --git a/libs/jackson-core-2.1.0-sources.jar b/libs/jackson-core-2.1.0-sources.jar
deleted file mode 100644
index 0e1bacf..0000000
Binary files a/libs/jackson-core-2.1.0-sources.jar and /dev/null differ
diff --git a/libs/jackson-core-2.1.0.jar b/libs/jackson-core-2.1.0.jar
deleted file mode 100644
index 6899eda..0000000
Binary files a/libs/jackson-core-2.1.0.jar and /dev/null differ
diff --git a/libs/jackson-databind-2.1.0-sources.jar b/libs/jackson-databind-2.1.0-sources.jar
deleted file mode 100644
index 761aba8..0000000
Binary files a/libs/jackson-databind-2.1.0-sources.jar and /dev/null differ
diff --git a/libs/jackson-databind-2.1.0.jar b/libs/jackson-databind-2.1.0.jar
deleted file mode 100644
index 5eceb00..0000000
Binary files a/libs/jackson-databind-2.1.0.jar and /dev/null differ
diff --git a/libs/mockito-all-1.9.5.jar b/libs/mockito-all-1.9.5.jar
deleted file mode 100644
index 00416eb..0000000
Binary files a/libs/mockito-all-1.9.5.jar and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..89c5d7c
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,17 @@
+/*
+ * This settings file was auto generated by the Gradle buildInit task
+ * by 'chris' at '14/05/14 17:45' with Gradle 1.12
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * In a single project build this file can be empty or even removed.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at http://gradle.org/docs/1.12/userguide/multi_project_builds.html
+ */
+/*
+// To declare projects as part of a multi-project build use the 'include' method
+include 'shared'
+include 'api'
+include 'services:webservice'
+*/
+rootProject.name = 'KeenClient-Android'
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..4dd75a1
--- /dev/null
+++ b/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="io.keen">
+
+</manifest>
diff --git a/src/io/keen/client/android/GlobalPropertiesEvaluator.java b/src/main/java/io/keen/client/android/GlobalPropertiesEvaluator.java
similarity index 100%
rename from src/io/keen/client/android/GlobalPropertiesEvaluator.java
rename to src/main/java/io/keen/client/android/GlobalPropertiesEvaluator.java
diff --git a/src/io/keen/client/android/KeenClient.java b/src/main/java/io/keen/client/android/KeenClient.java
similarity index 100%
rename from src/io/keen/client/android/KeenClient.java
rename to src/main/java/io/keen/client/android/KeenClient.java
diff --git a/src/io/keen/client/android/KeenConstants.java b/src/main/java/io/keen/client/android/KeenConstants.java
similarity index 100%
rename from src/io/keen/client/android/KeenConstants.java
rename to src/main/java/io/keen/client/android/KeenConstants.java
diff --git a/src/io/keen/client/android/KeenLogging.java b/src/main/java/io/keen/client/android/KeenLogging.java
similarity index 100%
rename from src/io/keen/client/android/KeenLogging.java
rename to src/main/java/io/keen/client/android/KeenLogging.java
diff --git a/src/io/keen/client/android/KeenUtils.java b/src/main/java/io/keen/client/android/KeenUtils.java
similarity index 100%
rename from src/io/keen/client/android/KeenUtils.java
rename to src/main/java/io/keen/client/android/KeenUtils.java
diff --git a/src/io/keen/client/android/UploadFinishedCallback.java b/src/main/java/io/keen/client/android/UploadFinishedCallback.java
similarity index 100%
rename from src/io/keen/client/android/UploadFinishedCallback.java
rename to src/main/java/io/keen/client/android/UploadFinishedCallback.java
diff --git a/src/io/keen/client/android/exceptions/InvalidEventCollectionException.java b/src/main/java/io/keen/client/android/exceptions/InvalidEventCollectionException.java
similarity index 100%
rename from src/io/keen/client/android/exceptions/InvalidEventCollectionException.java
rename to src/main/java/io/keen/client/android/exceptions/InvalidEventCollectionException.java
diff --git a/src/io/keen/client/android/exceptions/InvalidEventException.java b/src/main/java/io/keen/client/android/exceptions/InvalidEventException.java
similarity index 100%
rename from src/io/keen/client/android/exceptions/InvalidEventException.java
rename to src/main/java/io/keen/client/android/exceptions/InvalidEventException.java
diff --git a/src/io/keen/client/android/exceptions/KeenException.java b/src/main/java/io/keen/client/android/exceptions/KeenException.java
similarity index 100%
rename from src/io/keen/client/android/exceptions/KeenException.java
rename to src/main/java/io/keen/client/android/exceptions/KeenException.java
diff --git a/src/io/keen/client/android/exceptions/KeenInitializationException.java b/src/main/java/io/keen/client/android/exceptions/KeenInitializationException.java
similarity index 100%
rename from src/io/keen/client/android/exceptions/KeenInitializationException.java
rename to src/main/java/io/keen/client/android/exceptions/KeenInitializationException.java
diff --git a/src/io/keen/client/android/exceptions/NoWriteKeyException.java b/src/main/java/io/keen/client/android/exceptions/NoWriteKeyException.java
similarity index 100%
rename from src/io/keen/client/android/exceptions/NoWriteKeyException.java
rename to src/main/java/io/keen/client/android/exceptions/NoWriteKeyException.java
diff --git a/src-test/io/keen/client/android/KeenClientTest.java b/src/test/java/io/keen/client/android/KeenClientTest.java
similarity index 100%
rename from src-test/io/keen/client/android/KeenClientTest.java
rename to src/test/java/io/keen/client/android/KeenClientTest.java
diff --git a/src-test/io/keen/client/android/TestUtils.java b/src/test/java/io/keen/client/android/TestUtils.java
similarity index 100%
rename from src-test/io/keen/client/android/TestUtils.java
rename to src/test/java/io/keen/client/android/TestUtils.java