diff --git a/roles/matrix-server/tasks/import_media_store.yml b/roles/matrix-server/tasks/import/import_media_store.yml
similarity index 100%
rename from roles/matrix-server/tasks/import_media_store.yml
rename to roles/matrix-server/tasks/import/import_media_store.yml
diff --git a/roles/matrix-server/tasks/import_postgres.yml b/roles/matrix-server/tasks/import/import_postgres.yml
similarity index 100%
rename from roles/matrix-server/tasks/import_postgres.yml
rename to roles/matrix-server/tasks/import/import_postgres.yml
diff --git a/roles/matrix-server/tasks/import_sqlite_db.yml b/roles/matrix-server/tasks/import/import_sqlite_db.yml
similarity index 100%
rename from roles/matrix-server/tasks/import_sqlite_db.yml
rename to roles/matrix-server/tasks/import/import_sqlite_db.yml
diff --git a/roles/matrix-server/tasks/main.yml b/roles/matrix-server/tasks/main.yml
index 6f0382818..896efe829 100644
--- a/roles/matrix-server/tasks/main.yml
+++ b/roles/matrix-server/tasks/main.yml
@@ -3,7 +3,7 @@
 - include: tasks/setup/main.yml
   when: run_setup
 
-- include: tasks/import_postgres.yml
+- include: tasks/import/import_postgres.yml
   tags:
     - import-postgres
   when: run_import_postgres
@@ -23,12 +23,12 @@
     - register-user
   when: run_register_user
 
-- include: tasks/import_sqlite_db.yml
+- include: tasks/import/import_sqlite_db.yml
   tags:
     - import-sqlite-db
   when: run_import_sqlite_db
 
-- include: tasks/import_media_store.yml
+- include: tasks/import/import_media_store.yml
   tags:
     - import-media-store
   when: run_import_media_store