diff --git a/tactility/src/apps/system/files/file_utils.c b/tactility/src/apps/files/file_utils.c
similarity index 100%
rename from tactility/src/apps/system/files/file_utils.c
rename to tactility/src/apps/files/file_utils.c
diff --git a/tactility/src/apps/system/files/file_utils.h b/tactility/src/apps/files/file_utils.h
similarity index 100%
rename from tactility/src/apps/system/files/file_utils.h
rename to tactility/src/apps/files/file_utils.h
diff --git a/tactility/src/apps/system/files/files.c b/tactility/src/apps/files/files.c
similarity index 98%
rename from tactility/src/apps/system/files/files.c
rename to tactility/src/apps/files/files.c
index 1dcdf8d8..d6705169 100644
--- a/tactility/src/apps/system/files/files.c
+++ b/tactility/src/apps/files/files.c
@@ -1,8 +1,8 @@
 #include "files_data.h"
 
 #include "app.h"
-#include "apps/system/image_viewer/image_viewer.h"
-#include "apps/system/text_viewer/text_viewer.h"
+#include "apps/image_viewer/image_viewer.h"
+#include "apps/text_viewer/text_viewer.h"
 #include "assets.h"
 #include "check.h"
 #include "file_utils.h"
diff --git a/tactility/src/apps/system/files/files_data.c b/tactility/src/apps/files/files_data.c
similarity index 100%
rename from tactility/src/apps/system/files/files_data.c
rename to tactility/src/apps/files/files_data.c
diff --git a/tactility/src/apps/system/files/files_data.h b/tactility/src/apps/files/files_data.h
similarity index 100%
rename from tactility/src/apps/system/files/files_data.h
rename to tactility/src/apps/files/files_data.h
diff --git a/tactility/src/apps/system/image_viewer/image_viewer.c b/tactility/src/apps/image_viewer/image_viewer.c
similarity index 100%
rename from tactility/src/apps/system/image_viewer/image_viewer.c
rename to tactility/src/apps/image_viewer/image_viewer.c
diff --git a/tactility/src/apps/system/image_viewer/image_viewer.h b/tactility/src/apps/image_viewer/image_viewer.h
similarity index 100%
rename from tactility/src/apps/system/image_viewer/image_viewer.h
rename to tactility/src/apps/image_viewer/image_viewer.h
diff --git a/tactility/src/apps/system/system_info/system_info.c b/tactility/src/apps/system_info/system_info.c
similarity index 100%
rename from tactility/src/apps/system/system_info/system_info.c
rename to tactility/src/apps/system_info/system_info.c
diff --git a/tactility/src/apps/system/text_viewer/text_viewer.c b/tactility/src/apps/text_viewer/text_viewer.c
similarity index 100%
rename from tactility/src/apps/system/text_viewer/text_viewer.c
rename to tactility/src/apps/text_viewer/text_viewer.c
diff --git a/tactility/src/apps/system/text_viewer/text_viewer.h b/tactility/src/apps/text_viewer/text_viewer.h
similarity index 100%
rename from tactility/src/apps/system/text_viewer/text_viewer.h
rename to tactility/src/apps/text_viewer/text_viewer.h