diff --git a/xwords4/android/XWords4/res/.gitignore b/xwords4/android/app/src/main/res/.gitignore
similarity index 100%
rename from xwords4/android/XWords4/res/.gitignore
rename to xwords4/android/app/src/main/res/.gitignore
diff --git a/xwords4/android/XWords4/res/drawable-hdpi/.gitignore b/xwords4/android/app/src/main/res/drawable-hdpi/.gitignore
similarity index 100%
rename from xwords4/android/XWords4/res/drawable-hdpi/.gitignore
rename to xwords4/android/app/src/main/res/drawable-hdpi/.gitignore
diff --git a/xwords4/android/XWords4/res/drawable-hdpi/content_edit.png b/xwords4/android/app/src/main/res/drawable-hdpi/content_edit.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable-hdpi/content_edit.png
rename to xwords4/android/app/src/main/res/drawable-hdpi/content_edit.png
diff --git a/xwords4/android/XWords4/res/drawable-mdpi/.gitignore b/xwords4/android/app/src/main/res/drawable-mdpi/.gitignore
similarity index 100%
rename from xwords4/android/XWords4/res/drawable-mdpi/.gitignore
rename to xwords4/android/app/src/main/res/drawable-mdpi/.gitignore
diff --git a/xwords4/android/XWords4/res/drawable-mdpi/content_edit.png b/xwords4/android/app/src/main/res/drawable-mdpi/content_edit.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable-mdpi/content_edit.png
rename to xwords4/android/app/src/main/res/drawable-mdpi/content_edit.png
diff --git a/xwords4/android/XWords4/res/drawable-xhdpi/.gitignore b/xwords4/android/app/src/main/res/drawable-xhdpi/.gitignore
similarity index 100%
rename from xwords4/android/XWords4/res/drawable-xhdpi/.gitignore
rename to xwords4/android/app/src/main/res/drawable-xhdpi/.gitignore
diff --git a/xwords4/android/XWords4/res/drawable-xhdpi/content_edit.png b/xwords4/android/app/src/main/res/drawable-xhdpi/content_edit.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable-xhdpi/content_edit.png
rename to xwords4/android/app/src/main/res/drawable-xhdpi/content_edit.png
diff --git a/xwords4/android/XWords4/res/drawable/dicticon.png b/xwords4/android/app/src/main/res/drawable/dicticon.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/dicticon.png
rename to xwords4/android/app/src/main/res/drawable/dicticon.png
diff --git a/xwords4/android/XWords4/res/drawable/downarrow.png b/xwords4/android/app/src/main/res/drawable/downarrow.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/downarrow.png
rename to xwords4/android/app/src/main/res/drawable/downarrow.png
diff --git a/xwords4/android/XWords4/res/drawable/expander_ic_maximized.9.png b/xwords4/android/app/src/main/res/drawable/expander_ic_maximized.9.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/expander_ic_maximized.9.png
rename to xwords4/android/app/src/main/res/drawable/expander_ic_maximized.9.png
diff --git a/xwords4/android/XWords4/res/drawable/expander_ic_minimized.9.png b/xwords4/android/app/src/main/res/drawable/expander_ic_minimized.9.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/expander_ic_minimized.9.png
rename to xwords4/android/app/src/main/res/drawable/expander_ic_minimized.9.png
diff --git a/xwords4/android/XWords4/res/drawable/flip.png b/xwords4/android/app/src/main/res/drawable/flip.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/flip.png
rename to xwords4/android/app/src/main/res/drawable/flip.png
diff --git a/xwords4/android/XWords4/res/drawable/icon48x48.png b/xwords4/android/app/src/main/res/drawable/icon48x48.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/icon48x48.png
rename to xwords4/android/app/src/main/res/drawable/icon48x48.png
diff --git a/xwords4/android/XWords4/res/drawable/in_arrow.png b/xwords4/android/app/src/main/res/drawable/in_arrow.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/in_arrow.png
rename to xwords4/android/app/src/main/res/drawable/in_arrow.png
diff --git a/xwords4/android/XWords4/res/drawable/in_arrow_active.png b/xwords4/android/app/src/main/res/drawable/in_arrow_active.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/in_arrow_active.png
rename to xwords4/android/app/src/main/res/drawable/in_arrow_active.png
diff --git a/xwords4/android/XWords4/res/drawable/next_hint.png b/xwords4/android/app/src/main/res/drawable/next_hint.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/next_hint.png
rename to xwords4/android/app/src/main/res/drawable/next_hint.png
diff --git a/xwords4/android/XWords4/res/drawable/notify.png b/xwords4/android/app/src/main/res/drawable/notify.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/notify.png
rename to xwords4/android/app/src/main/res/drawable/notify.png
diff --git a/xwords4/android/XWords4/res/drawable/origin.png b/xwords4/android/app/src/main/res/drawable/origin.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/origin.png
rename to xwords4/android/app/src/main/res/drawable/origin.png
diff --git a/xwords4/android/XWords4/res/drawable/out_arrow.png b/xwords4/android/app/src/main/res/drawable/out_arrow.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/out_arrow.png
rename to xwords4/android/app/src/main/res/drawable/out_arrow.png
diff --git a/xwords4/android/XWords4/res/drawable/out_arrow_active.png b/xwords4/android/app/src/main/res/drawable/out_arrow_active.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/out_arrow_active.png
rename to xwords4/android/app/src/main/res/drawable/out_arrow_active.png
diff --git a/xwords4/android/XWords4/res/drawable/prev_hint.png b/xwords4/android/app/src/main/res/drawable/prev_hint.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/prev_hint.png
rename to xwords4/android/app/src/main/res/drawable/prev_hint.png
diff --git a/xwords4/android/XWords4/res/drawable/refresh.png b/xwords4/android/app/src/main/res/drawable/refresh.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/refresh.png
rename to xwords4/android/app/src/main/res/drawable/refresh.png
diff --git a/xwords4/android/XWords4/res/drawable/rightarrow.png b/xwords4/android/app/src/main/res/drawable/rightarrow.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/rightarrow.png
rename to xwords4/android/app/src/main/res/drawable/rightarrow.png
diff --git a/xwords4/android/XWords4/res/drawable/shuffle.png b/xwords4/android/app/src/main/res/drawable/shuffle.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/shuffle.png
rename to xwords4/android/app/src/main/res/drawable/shuffle.png
diff --git a/xwords4/android/XWords4/res/drawable/stat_notify_chat.png b/xwords4/android/app/src/main/res/drawable/stat_notify_chat.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/stat_notify_chat.png
rename to xwords4/android/app/src/main/res/drawable/stat_notify_chat.png
diff --git a/xwords4/android/XWords4/res/drawable/stat_notify_sync.png b/xwords4/android/app/src/main/res/drawable/stat_notify_sync.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/stat_notify_sync.png
rename to xwords4/android/app/src/main/res/drawable/stat_notify_sync.png
diff --git a/xwords4/android/XWords4/res/drawable/undo.png b/xwords4/android/app/src/main/res/drawable/undo.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/undo.png
rename to xwords4/android/app/src/main/res/drawable/undo.png
diff --git a/xwords4/android/XWords4/res/drawable/values.png b/xwords4/android/app/src/main/res/drawable/values.png
similarity index 100%
rename from xwords4/android/XWords4/res/drawable/values.png
rename to xwords4/android/app/src/main/res/drawable/values.png
diff --git a/xwords4/android/XWords4/res/menu/.gitignore b/xwords4/android/app/src/main/res/menu/.gitignore
similarity index 100%
rename from xwords4/android/XWords4/res/menu/.gitignore
rename to xwords4/android/app/src/main/res/menu/.gitignore
diff --git a/xwords4/android/XWords4/res/values/.gitignore b/xwords4/android/app/src/main/res/values/.gitignore
similarity index 100%
rename from xwords4/android/XWords4/res/values/.gitignore
rename to xwords4/android/app/src/main/res/values/.gitignore