diff --git a/android/android/AndroidSonarClient.java b/android/src/main/java/com/facebook/sonar/android/AndroidSonarClient.java
similarity index 100%
rename from android/android/AndroidSonarClient.java
rename to android/src/main/java/com/facebook/sonar/android/AndroidSonarClient.java
diff --git a/android/android/EventBase.java b/android/src/main/java/com/facebook/sonar/android/EventBase.java
similarity index 100%
rename from android/android/EventBase.java
rename to android/src/main/java/com/facebook/sonar/android/EventBase.java
diff --git a/android/android/SonarClientImpl.java b/android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java
similarity index 100%
rename from android/android/SonarClientImpl.java
rename to android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java
diff --git a/android/android/SonarConnectionImpl.java b/android/src/main/java/com/facebook/sonar/android/SonarConnectionImpl.java
similarity index 100%
rename from android/android/SonarConnectionImpl.java
rename to android/src/main/java/com/facebook/sonar/android/SonarConnectionImpl.java
diff --git a/android/android/SonarResponderImpl.java b/android/src/main/java/com/facebook/sonar/android/SonarResponderImpl.java
similarity index 100%
rename from android/android/SonarResponderImpl.java
rename to android/src/main/java/com/facebook/sonar/android/SonarResponderImpl.java
diff --git a/android/android/SonarThread.java b/android/src/main/java/com/facebook/sonar/android/SonarThread.java
similarity index 100%
rename from android/android/SonarThread.java
rename to android/src/main/java/com/facebook/sonar/android/SonarThread.java
diff --git a/android/android/sonar.cpp b/android/src/main/java/com/facebook/sonar/android/sonar.cpp
similarity index 100%
rename from android/android/sonar.cpp
rename to android/src/main/java/com/facebook/sonar/android/sonar.cpp
diff --git a/android/android/utils/SonarUtils.java b/android/src/main/java/com/facebook/sonar/android/utils/SonarUtils.java
similarity index 100%
rename from android/android/utils/SonarUtils.java
rename to android/src/main/java/com/facebook/sonar/android/utils/SonarUtils.java