diff --git a/src/kordophone-application.vala b/src/application/kordophone-application.vala
similarity index 100%
rename from src/kordophone-application.vala
rename to src/application/kordophone-application.vala
diff --git a/src/main-window.vala b/src/application/main-window.vala
similarity index 100%
rename from src/main-window.vala
rename to src/application/main-window.vala
diff --git a/src/conversation-list-model.vala b/src/conversation-list/conversation-list-model.vala
similarity index 100%
rename from src/conversation-list-model.vala
rename to src/conversation-list/conversation-list-model.vala
diff --git a/src/conversation-list-view.vala b/src/conversation-list/conversation-list-view.vala
similarity index 100%
rename from src/conversation-list-view.vala
rename to src/conversation-list/conversation-list-view.vala
diff --git a/src/conversation-row.vala b/src/conversation-list/conversation-row.vala
similarity index 100%
rename from src/conversation-row.vala
rename to src/conversation-list/conversation-row.vala
diff --git a/src/meson.build b/src/meson.build
index 9476a2b..3795d9c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,13 +6,16 @@ dependencies = [
 ]
 
 sources = [
-    'kordophone-application.vala',
-    'main-window.vala',
-    'conversation-list-view.vala',
-    'conversation.vala',
-    'conversation-row.vala',
-    'conversation-list-model.vala',
-    'repository-service.vala'
+    'application/kordophone-application.vala',
+    'application/main-window.vala',
+
+    'service/repository-service.vala',
+
+    'conversation-list/conversation-list-view.vala',
+    'conversation-list/conversation-list-model.vala',
+    'conversation-list/conversation-row.vala',
+
+    'models/conversation.vala',
 ]
 
 executable('kordophone',
diff --git a/src/conversation.vala b/src/models/conversation.vala
similarity index 100%
rename from src/conversation.vala
rename to src/models/conversation.vala
diff --git a/src/repository-service.vala b/src/service/repository-service.vala
similarity index 100%
rename from src/repository-service.vala
rename to src/service/repository-service.vala