diff --git a/android/core/ErrorReportingRunnable.java b/android/src/main/java/com/facebook/sonar/core/ErrorReportingRunnable.java
similarity index 100%
rename from android/core/ErrorReportingRunnable.java
rename to android/src/main/java/com/facebook/sonar/core/ErrorReportingRunnable.java
diff --git a/android/core/SonarArray.java b/android/src/main/java/com/facebook/sonar/core/SonarArray.java
similarity index 100%
rename from android/core/SonarArray.java
rename to android/src/main/java/com/facebook/sonar/core/SonarArray.java
diff --git a/android/core/SonarClient.java b/android/src/main/java/com/facebook/sonar/core/SonarClient.java
similarity index 100%
rename from android/core/SonarClient.java
rename to android/src/main/java/com/facebook/sonar/core/SonarClient.java
diff --git a/android/core/SonarConnection.java b/android/src/main/java/com/facebook/sonar/core/SonarConnection.java
similarity index 100%
rename from android/core/SonarConnection.java
rename to android/src/main/java/com/facebook/sonar/core/SonarConnection.java
diff --git a/android/core/SonarDynamic.java b/android/src/main/java/com/facebook/sonar/core/SonarDynamic.java
similarity index 100%
rename from android/core/SonarDynamic.java
rename to android/src/main/java/com/facebook/sonar/core/SonarDynamic.java
diff --git a/android/core/SonarObject.java b/android/src/main/java/com/facebook/sonar/core/SonarObject.java
similarity index 100%
rename from android/core/SonarObject.java
rename to android/src/main/java/com/facebook/sonar/core/SonarObject.java
diff --git a/android/core/SonarPlugin.java b/android/src/main/java/com/facebook/sonar/core/SonarPlugin.java
similarity index 100%
rename from android/core/SonarPlugin.java
rename to android/src/main/java/com/facebook/sonar/core/SonarPlugin.java
diff --git a/android/core/SonarReceiver.java b/android/src/main/java/com/facebook/sonar/core/SonarReceiver.java
similarity index 100%
rename from android/core/SonarReceiver.java
rename to android/src/main/java/com/facebook/sonar/core/SonarReceiver.java
diff --git a/android/core/SonarResponder.java b/android/src/main/java/com/facebook/sonar/core/SonarResponder.java
similarity index 100%
rename from android/core/SonarResponder.java
rename to android/src/main/java/com/facebook/sonar/core/SonarResponder.java
diff --git a/android/core/SonarValue.java b/android/src/main/java/com/facebook/sonar/core/SonarValue.java
similarity index 100%
rename from android/core/SonarValue.java
rename to android/src/main/java/com/facebook/sonar/core/SonarValue.java