diff --git a/android/plugins/common/BufferingSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/common/BufferingSonarPlugin.java
similarity index 100%
rename from android/plugins/common/BufferingSonarPlugin.java
rename to android/src/main/java/com/facebook/sonar/plugins/common/BufferingSonarPlugin.java
diff --git a/android/plugins/common/MainThreadSonarReceiver.java b/android/src/main/java/com/facebook/sonar/plugins/common/MainThreadSonarReceiver.java
similarity index 100%
rename from android/plugins/common/MainThreadSonarReceiver.java
rename to android/src/main/java/com/facebook/sonar/plugins/common/MainThreadSonarReceiver.java
diff --git a/android/plugins/common/RingBuffer.java b/android/src/main/java/com/facebook/sonar/plugins/common/RingBuffer.java
similarity index 100%
rename from android/plugins/common/RingBuffer.java
rename to android/src/main/java/com/facebook/sonar/plugins/common/RingBuffer.java
diff --git a/android/plugins/console/ConsoleSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/console/ConsoleSonarPlugin.java
similarity index 100%
rename from android/plugins/console/ConsoleSonarPlugin.java
rename to android/src/main/java/com/facebook/sonar/plugins/console/ConsoleSonarPlugin.java
diff --git a/android/plugins/console/JavascriptEnvironment.java b/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptEnvironment.java
similarity index 100%
rename from android/plugins/console/JavascriptEnvironment.java
rename to android/src/main/java/com/facebook/sonar/plugins/console/JavascriptEnvironment.java
diff --git a/android/plugins/console/JavascriptSession.java b/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptSession.java
similarity index 100%
rename from android/plugins/console/JavascriptSession.java
rename to android/src/main/java/com/facebook/sonar/plugins/console/JavascriptSession.java
diff --git a/android/plugins/console/iface/ConsoleCommandReceiver.java b/android/src/main/java/com/facebook/sonar/plugins/console/iface/ConsoleCommandReceiver.java
similarity index 100%
rename from android/plugins/console/iface/ConsoleCommandReceiver.java
rename to android/src/main/java/com/facebook/sonar/plugins/console/iface/ConsoleCommandReceiver.java
diff --git a/android/plugins/console/iface/NullScriptingEnvironment.java b/android/src/main/java/com/facebook/sonar/plugins/console/iface/NullScriptingEnvironment.java
similarity index 100%
rename from android/plugins/console/iface/NullScriptingEnvironment.java
rename to android/src/main/java/com/facebook/sonar/plugins/console/iface/NullScriptingEnvironment.java
diff --git a/android/plugins/console/iface/ScriptingEnvironment.java b/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingEnvironment.java
similarity index 100%
rename from android/plugins/console/iface/ScriptingEnvironment.java
rename to android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingEnvironment.java
diff --git a/android/plugins/console/iface/ScriptingSession.java b/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingSession.java
similarity index 100%
rename from android/plugins/console/iface/ScriptingSession.java
rename to android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingSession.java
diff --git a/android/plugins/inspector/ApplicationWrapper.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/ApplicationWrapper.java
similarity index 100%
rename from android/plugins/inspector/ApplicationWrapper.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/ApplicationWrapper.java
diff --git a/android/plugins/inspector/BoundsDrawable.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/BoundsDrawable.java
similarity index 100%
rename from android/plugins/inspector/BoundsDrawable.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/BoundsDrawable.java
diff --git a/android/plugins/inspector/DescriptorMapping.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/DescriptorMapping.java
similarity index 100%
rename from android/plugins/inspector/DescriptorMapping.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/DescriptorMapping.java
diff --git a/android/plugins/inspector/HiddenNode.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/HiddenNode.java
similarity index 100%
rename from android/plugins/inspector/HiddenNode.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/HiddenNode.java
diff --git a/android/plugins/inspector/HighlightedOverlay.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/HighlightedOverlay.java
similarity index 100%
rename from android/plugins/inspector/HighlightedOverlay.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/HighlightedOverlay.java
diff --git a/android/plugins/inspector/InspectorSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java
similarity index 100%
rename from android/plugins/inspector/InspectorSonarPlugin.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java
diff --git a/android/plugins/inspector/InspectorValue.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorValue.java
similarity index 100%
rename from android/plugins/inspector/InspectorValue.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorValue.java
diff --git a/android/plugins/inspector/Named.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/Named.java
similarity index 100%
rename from android/plugins/inspector/Named.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/Named.java
diff --git a/android/plugins/inspector/NodeDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java
similarity index 100%
rename from android/plugins/inspector/NodeDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java
diff --git a/android/plugins/inspector/ObjectTracker.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/ObjectTracker.java
similarity index 100%
rename from android/plugins/inspector/ObjectTracker.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/ObjectTracker.java
diff --git a/android/plugins/inspector/SearchResultNode.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/SearchResultNode.java
similarity index 100%
rename from android/plugins/inspector/SearchResultNode.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/SearchResultNode.java
diff --git a/android/plugins/inspector/SelfRegisteringNodeDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/SelfRegisteringNodeDescriptor.java
similarity index 100%
rename from android/plugins/inspector/SelfRegisteringNodeDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/SelfRegisteringNodeDescriptor.java
diff --git a/android/plugins/inspector/Touch.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/Touch.java
similarity index 100%
rename from android/plugins/inspector/Touch.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/Touch.java
diff --git a/android/plugins/inspector/descriptors/ActivityDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ActivityDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/ActivityDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ActivityDescriptor.java
diff --git a/android/plugins/inspector/descriptors/ApplicationDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ApplicationDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/ApplicationDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ApplicationDescriptor.java
diff --git a/android/plugins/inspector/descriptors/DialogDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/DialogDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogDescriptor.java
diff --git a/android/plugins/inspector/descriptors/DialogFragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/DialogFragmentDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java
diff --git a/android/plugins/inspector/descriptors/DrawableDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DrawableDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/DrawableDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DrawableDescriptor.java
diff --git a/android/plugins/inspector/descriptors/FragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/FragmentDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java
diff --git a/android/plugins/inspector/descriptors/ObjectDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ObjectDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/ObjectDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ObjectDescriptor.java
diff --git a/android/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
diff --git a/android/plugins/inspector/descriptors/SupportFragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/SupportFragmentDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java
diff --git a/android/plugins/inspector/descriptors/TextViewDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/TextViewDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/TextViewDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/TextViewDescriptor.java
diff --git a/android/plugins/inspector/descriptors/ViewDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/ViewDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewDescriptor.java
diff --git a/android/plugins/inspector/descriptors/ViewGroupDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/ViewGroupDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptor.java
diff --git a/android/plugins/inspector/descriptors/WindowDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/WindowDescriptor.java
similarity index 100%
rename from android/plugins/inspector/descriptors/WindowDescriptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/WindowDescriptor.java
diff --git a/android/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java
similarity index 100%
rename from android/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java
diff --git a/android/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java
similarity index 100%
rename from android/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java
diff --git a/android/plugins/inspector/descriptors/utils/AccessibilityUtil.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityUtil.java
similarity index 100%
rename from android/plugins/inspector/descriptors/utils/AccessibilityUtil.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityUtil.java
diff --git a/android/plugins/inspector/descriptors/utils/AndroidRootResolver.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AndroidRootResolver.java
similarity index 100%
rename from android/plugins/inspector/descriptors/utils/AndroidRootResolver.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AndroidRootResolver.java
diff --git a/android/plugins/inspector/descriptors/utils/EnumMapping.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/EnumMapping.java
similarity index 100%
rename from android/plugins/inspector/descriptors/utils/EnumMapping.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/EnumMapping.java
diff --git a/android/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java
similarity index 100%
rename from android/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java
rename to android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java
diff --git a/android/plugins/network/NetworkReporter.java b/android/src/main/java/com/facebook/sonar/plugins/network/NetworkReporter.java
similarity index 100%
rename from android/plugins/network/NetworkReporter.java
rename to android/src/main/java/com/facebook/sonar/plugins/network/NetworkReporter.java
diff --git a/android/plugins/network/NetworkResponseFormatter.java b/android/src/main/java/com/facebook/sonar/plugins/network/NetworkResponseFormatter.java
similarity index 100%
rename from android/plugins/network/NetworkResponseFormatter.java
rename to android/src/main/java/com/facebook/sonar/plugins/network/NetworkResponseFormatter.java
diff --git a/android/plugins/network/NetworkSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/network/NetworkSonarPlugin.java
similarity index 100%
rename from android/plugins/network/NetworkSonarPlugin.java
rename to android/src/main/java/com/facebook/sonar/plugins/network/NetworkSonarPlugin.java
diff --git a/android/plugins/network/SonarOkhttpInterceptor.java b/android/src/main/java/com/facebook/sonar/plugins/network/SonarOkhttpInterceptor.java
similarity index 100%
rename from android/plugins/network/SonarOkhttpInterceptor.java
rename to android/src/main/java/com/facebook/sonar/plugins/network/SonarOkhttpInterceptor.java
diff --git a/android/plugins/sandbox/SandboxSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPlugin.java
similarity index 100%
rename from android/plugins/sandbox/SandboxSonarPlugin.java
rename to android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPlugin.java
diff --git a/android/plugins/sandbox/SandboxSonarPluginStrategy.java b/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPluginStrategy.java
similarity index 100%
rename from android/plugins/sandbox/SandboxSonarPluginStrategy.java
rename to android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPluginStrategy.java
diff --git a/android/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java
similarity index 100%
rename from android/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java
rename to android/src/main/java/com/facebook/sonar/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java