diff --git a/draw9patch/Android.mk b/draw9patch/Android.mk
index ddb8707..444e582 100644
--- a/draw9patch/Android.mk
+++ b/draw9patch/Android.mk
@@ -15,8 +15,8 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_RESOURCE_DIRS := src
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
+LOCAL_JAVA_RESOURCE_DIRS := src/main/resources
 
 LOCAL_JAR_MANIFEST := etc/manifest.txt
 
diff --git a/draw9patch/src/com/android/draw9patch/Application.java b/draw9patch/src/main/java/com/android/draw9patch/Application.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/Application.java
rename to draw9patch/src/main/java/com/android/draw9patch/Application.java
diff --git a/draw9patch/src/com/android/draw9patch/graphics/GraphicsUtilities.java b/draw9patch/src/main/java/com/android/draw9patch/graphics/GraphicsUtilities.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/graphics/GraphicsUtilities.java
rename to draw9patch/src/main/java/com/android/draw9patch/graphics/GraphicsUtilities.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/GradientPanel.java b/draw9patch/src/main/java/com/android/draw9patch/ui/GradientPanel.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/GradientPanel.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/GradientPanel.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/ImageEditorPanel.java b/draw9patch/src/main/java/com/android/draw9patch/ui/ImageEditorPanel.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/ImageEditorPanel.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/ImageEditorPanel.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/ImageTransferHandler.java b/draw9patch/src/main/java/com/android/draw9patch/ui/ImageTransferHandler.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/ImageTransferHandler.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/ImageTransferHandler.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/MainFrame.java b/draw9patch/src/main/java/com/android/draw9patch/ui/MainFrame.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/MainFrame.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/MainFrame.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/OpenFilePanel.java b/draw9patch/src/main/java/com/android/draw9patch/ui/OpenFilePanel.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/OpenFilePanel.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/OpenFilePanel.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/PngFileFilter.java b/draw9patch/src/main/java/com/android/draw9patch/ui/PngFileFilter.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/PngFileFilter.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/PngFileFilter.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/action/BackgroundAction.java b/draw9patch/src/main/java/com/android/draw9patch/ui/action/BackgroundAction.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/action/BackgroundAction.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/action/BackgroundAction.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/action/ExitAction.java b/draw9patch/src/main/java/com/android/draw9patch/ui/action/ExitAction.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/action/ExitAction.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/action/ExitAction.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/action/OpenAction.java b/draw9patch/src/main/java/com/android/draw9patch/ui/action/OpenAction.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/action/OpenAction.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/action/OpenAction.java
diff --git a/draw9patch/src/com/android/draw9patch/ui/action/SaveAction.java b/draw9patch/src/main/java/com/android/draw9patch/ui/action/SaveAction.java
similarity index 100%
rename from draw9patch/src/com/android/draw9patch/ui/action/SaveAction.java
rename to draw9patch/src/main/java/com/android/draw9patch/ui/action/SaveAction.java
diff --git a/draw9patch/src/images/checker.png b/draw9patch/src/main/resources/images/checker.png
similarity index 100%
rename from draw9patch/src/images/checker.png
rename to draw9patch/src/main/resources/images/checker.png
Binary files differ
diff --git a/draw9patch/src/images/drop.png b/draw9patch/src/main/resources/images/drop.png
similarity index 100%
rename from draw9patch/src/images/drop.png
rename to draw9patch/src/main/resources/images/drop.png
Binary files differ