diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Makefile.inc b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Makefile.inc
index 5485b21..d9002af 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Makefile.inc
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Makefile.inc
@@ -26,7 +26,7 @@
 OBJSX=JAGyrotronA_FY19_P1.x
 
 #Location of the Build directory where the configuration file will be written to
-BUILD_DIR?=.
+BUILD_DIR?=./Out/
 
 #Location of the MakeDefaults directory.
 #Note that the MARTe2_DIR environment variable
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/JAGyrotronA_FY19_P1.20251219.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Out/JAGyrotronA_FY19_P1.20251219.marte
similarity index 100%
rename from EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/JAGyrotronA_FY19_P1.20251219.marte
rename to EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Out/JAGyrotronA_FY19_P1.20251219.marte
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/JAGyrotronA_FY19_P1.cfg b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Out/JAGyrotronA_FY19_P1.cfg
similarity index 100%
rename from EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/JAGyrotronA_FY19_P1.cfg
rename to EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Out/JAGyrotronA_FY19_P1.cfg
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/JAGyrotronB_FY19_P1.cfg b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Out/JAGyrotronB_FY19_P1.cfg
similarity index 100%
rename from EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/JAGyrotronB_FY19_P1.cfg
rename to EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Out/JAGyrotronB_FY19_P1.cfg
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/JAGyrotronIOC.db b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/tests/JAGyrotronIOC.db
similarity index 100%
rename from EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/JAGyrotronIOC.db
rename to EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/tests/JAGyrotronIOC.db