diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8910a47..01ea66a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ build-gerbers-default:
   script:
     - mkdir -p build/default/src
     - cd build/default
-    - cp ../../elec/layout/*.kicad_pcb src/
+    - cp ../../elec/layout/default/*.kicad_pcb src/
     - sed -i "s/"'{{GITHASH}}'"/$CI_COMMIT_SHORT_SHA/g" src/*.kicad_pcb
     - mkdir gerbers
     - kicad-cli pcb export gerbers -o gerbers/ src/*.kicad_pcb
diff --git a/elec/layout/default/fp-lib-table b/elec/layout/default/fp-lib-table
new file mode 100644
index 0000000..2c80223
--- /dev/null
+++ b/elec/layout/default/fp-lib-table
@@ -0,0 +1,4 @@
+(fp_lib_table
+  (version 7)
+  (lib (name "lib")(type "KiCad")(uri "${KIPRJMOD}/../../../build/footprints/footprints.pretty")(options "")(descr ""))
+)
diff --git a/elec/layout/template123.kicad_pcb b/elec/layout/default/template123.kicad_pcb
similarity index 100%
rename from elec/layout/template123.kicad_pcb
rename to elec/layout/default/template123.kicad_pcb
diff --git a/elec/layout/template123.kicad_pro b/elec/layout/default/template123.kicad_pro
similarity index 100%
rename from elec/layout/template123.kicad_pro
rename to elec/layout/default/template123.kicad_pro
diff --git a/elec/layout/template123.kicad_sch b/elec/layout/default/template123.kicad_sch
similarity index 100%
rename from elec/layout/template123.kicad_sch
rename to elec/layout/default/template123.kicad_sch
diff --git a/elec/layout/fp-lib-table b/elec/layout/fp-lib-table
deleted file mode 100644
index d29c4d1..0000000
--- a/elec/layout/fp-lib-table
+++ /dev/null
@@ -1,4 +0,0 @@
-(fp_lib_table
-  (version 7)
-  (lib (name "lib")(type "KiCad")(uri "${KIPRJMOD}/../../build/footprints/footprints.pretty")(options "")(descr ""))
-)