diff --git a/modules/first_boot.py b/modules/first_boot.py
index ae5c55471..2003115bb 120000
--- a/modules/first_boot.py
+++ b/modules/first_boot.py
@@ -1 +1 @@
-installed/first_boot.py
\ No newline at end of file
+installed/first_boot/first_boot.py
\ No newline at end of file
diff --git a/modules/installed/first_boot.py b/modules/installed/first_boot/first_boot.py
similarity index 100%
rename from modules/installed/first_boot.py
rename to modules/installed/first_boot/first_boot.py
diff --git a/modules/installed/templates/firstboot_sidebar.html b/modules/installed/first_boot/templates/firstboot_sidebar.html
similarity index 100%
rename from modules/installed/templates/firstboot_sidebar.html
rename to modules/installed/first_boot/templates/firstboot_sidebar.html
diff --git a/modules/installed/templates/firstboot_state0.html b/modules/installed/first_boot/templates/firstboot_state0.html
similarity index 100%
rename from modules/installed/templates/firstboot_state0.html
rename to modules/installed/first_boot/templates/firstboot_state0.html
diff --git a/modules/installed/templates/firstboot_state1.html b/modules/installed/first_boot/templates/firstboot_state1.html
similarity index 100%
rename from modules/installed/templates/firstboot_state1.html
rename to modules/installed/first_boot/templates/firstboot_state1.html