diff --git a/kibot/yaml/kibot_main.yaml b/kibot/yaml/kibot_main.yaml
index 2210c6f..a3105b2 100644
--- a/kibot/yaml/kibot_main.yaml
+++ b/kibot/yaml/kibot_main.yaml
@@ -130,31 +130,31 @@ import:
       COMMENT: Only parts with LCSC Part Number
 
   # Preflights ===============================================================
-  - file: kibot_pre_set_text_variables.yaml
+  - file: preflights/kibot_pre_set_text_variables.yaml
     definitions:
       SCRIPTS_DIR: @SCRIPTS_DIR@
       FABRICATION_DIR: @FABRICATION_DIR@
       ASSEMBLY_DIR: @ASSEMBLY_DIR@
 
   # Generate ERC Report
-  - file: kibot_pre_erc_report.yaml
+  - file: preflights/kibot_pre_erc_report.yaml
     definitions:
       DIR: @REPORT_DIR@
 
   # Generate DRC Report
-  - file: kibot_pre_drc_report.yaml
+  - file: preflights/kibot_pre_drc_report.yaml
     definitions:
       CHECK_ZONE_FILLS: @CHECK_ZONE_FILLS@
       DIR: @REPORT_DIR@
 
   # Draw stackup table in PCB. Needs gerber output
-  - file: kibot_pre_draw_stackup.yaml
+  - file: preflights/kibot_pre_draw_stackup.yaml
     definitions:
       GERBER_OUTPUT: @GERBER_OUTPUT@
       NOTE: @STACKUP_TABLE_NOTE@
 
   # Include tables for PCB and Assembly Drawings
-  - file: kibot_pre_include_table.yaml
+  - file: preflights/kibot_pre_include_table.yaml
     definitions:
       NAME_TP_TOP: @CSV_TP_TOP_OUTPUT@
       NAME_TP_BOTTOM: @CSV_TP_BOTTOM_OUTPUT@
diff --git a/kibot/yaml/kibot_pre_draw_stackup.yaml b/kibot/yaml/preflights/kibot_pre_draw_stackup.yaml
similarity index 100%
rename from kibot/yaml/kibot_pre_draw_stackup.yaml
rename to kibot/yaml/preflights/kibot_pre_draw_stackup.yaml
diff --git a/kibot/yaml/kibot_pre_drc_report.yaml b/kibot/yaml/preflights/kibot_pre_drc_report.yaml
similarity index 100%
rename from kibot/yaml/kibot_pre_drc_report.yaml
rename to kibot/yaml/preflights/kibot_pre_drc_report.yaml
diff --git a/kibot/yaml/kibot_pre_erc_report.yaml b/kibot/yaml/preflights/kibot_pre_erc_report.yaml
similarity index 100%
rename from kibot/yaml/kibot_pre_erc_report.yaml
rename to kibot/yaml/preflights/kibot_pre_erc_report.yaml
diff --git a/kibot/yaml/kibot_pre_include_table.yaml b/kibot/yaml/preflights/kibot_pre_include_table.yaml
similarity index 100%
rename from kibot/yaml/kibot_pre_include_table.yaml
rename to kibot/yaml/preflights/kibot_pre_include_table.yaml
diff --git a/kibot/yaml/kibot_pre_set_text_variables.yaml b/kibot/yaml/preflights/kibot_pre_set_text_variables.yaml
similarity index 100%
rename from kibot/yaml/kibot_pre_set_text_variables.yaml
rename to kibot/yaml/preflights/kibot_pre_set_text_variables.yaml
diff --git a/kibot/yaml/kibot_pre_update_xml.yaml b/kibot/yaml/preflights/kibot_pre_update_xml.yaml
similarity index 100%
rename from kibot/yaml/kibot_pre_update_xml.yaml
rename to kibot/yaml/preflights/kibot_pre_update_xml.yaml