diff --git a/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java b/app/src/common/java/app/fedilab/android/activities/PhotoEditorActivity.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
rename to app/src/common/java/app/fedilab/android/activities/PhotoEditorActivity.java
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/ColorPickerAdapter.java b/app/src/common/java/app/fedilab/android/imageeditor/ColorPickerAdapter.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/imageeditor/ColorPickerAdapter.java
rename to app/src/common/java/app/fedilab/android/imageeditor/ColorPickerAdapter.java
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/EmojiBSFragment.java b/app/src/common/java/app/fedilab/android/imageeditor/EmojiBSFragment.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/imageeditor/EmojiBSFragment.java
rename to app/src/common/java/app/fedilab/android/imageeditor/EmojiBSFragment.java
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/PropertiesBSFragment.java b/app/src/common/java/app/fedilab/android/imageeditor/PropertiesBSFragment.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/imageeditor/PropertiesBSFragment.java
rename to app/src/common/java/app/fedilab/android/imageeditor/PropertiesBSFragment.java
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/StickerBSFragment.java b/app/src/common/java/app/fedilab/android/imageeditor/StickerBSFragment.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/imageeditor/StickerBSFragment.java
rename to app/src/common/java/app/fedilab/android/imageeditor/StickerBSFragment.java
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/TextEditorDialogFragment.java b/app/src/common/java/app/fedilab/android/imageeditor/TextEditorDialogFragment.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/imageeditor/TextEditorDialogFragment.java
rename to app/src/common/java/app/fedilab/android/imageeditor/TextEditorDialogFragment.java
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/filters/FilterListener.java b/app/src/common/java/app/fedilab/android/imageeditor/filters/FilterListener.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/imageeditor/filters/FilterListener.java
rename to app/src/common/java/app/fedilab/android/imageeditor/filters/FilterListener.java
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/filters/FilterViewAdapter.java b/app/src/common/java/app/fedilab/android/imageeditor/filters/FilterViewAdapter.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/imageeditor/filters/FilterViewAdapter.java
rename to app/src/common/java/app/fedilab/android/imageeditor/filters/FilterViewAdapter.java
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java b/app/src/common/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java
rename to app/src/common/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/tools/ToolType.java b/app/src/common/java/app/fedilab/android/imageeditor/tools/ToolType.java
similarity index 100%
rename from app/src/main/java/app/fedilab/android/imageeditor/tools/ToolType.java
rename to app/src/common/java/app/fedilab/android/imageeditor/tools/ToolType.java