diff --git a/firmware/config/boards/kinetis/config/!gen_config.bat b/firmware/config/boards/kinetis/config/!gen_config.bat
index 26cd37ac21..c57969c2b1 100644
--- a/firmware/config/boards/kinetis/config/!gen_config.bat
+++ b/firmware/config/boards/kinetis/config/!gen_config.bat
@@ -31,5 +31,5 @@ java ^
  -c_defines config/boards/kinetis/config/controllers/algo/rusefi_generated.h ^
  -c_destination config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h ^
  -prepend config/boards/kinetis/config/rusefi_config_kinetis.txt ^
- -prepend config/boards/kinetis/config/tunerstudio/kinetis_prefix.txt
+ -prepend config/boards/kinetis/config/tunerstudio/generated/kinetis_prefix.txt
 
diff --git a/firmware/config/boards/kinetis/config/gen_config.sh b/firmware/config/boards/kinetis/config/gen_config.sh
index c02a524778..8415eab4ef 100644
--- a/firmware/config/boards/kinetis/config/gen_config.sh
+++ b/firmware/config/boards/kinetis/config/gen_config.sh
@@ -35,5 +35,5 @@ java \
  -signature tunerstudio/generated/signature_kin.txt \
  -signature_destination controllers/generated/signature_kin.h \
  -prepend config/boards/kinetis/config/rusefi_config_kinetis.txt \
- -prepend config/boards/kinetis/config/tunerstudio/kinetis_prefix.txt
+ -prepend config/boards/kinetis/config/tunerstudio/generated/kinetis_prefix.txt
 
diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh
index 533433b9a4..4ebfe496e1 100644
--- a/firmware/gen_config_board.sh
+++ b/firmware/gen_config_board.sh
@@ -25,7 +25,7 @@ java -DSystemOut.name=gen_config_board \
 	com.rusefi.board_generator.BoardReader \
 	-yaml config/boards/${BOARDNAME}/mapping.yaml \
 	-firmware_path . \
-  -output_file tunerstudio/${BOARDNAME}_prefix.txt \
+  -output_file tunerstudio/generated/${BOARDNAME}_prefix.txt \
 	-enumInputFile controllers/algo/rusefi_enums.h \
 	-enumInputFile controllers/algo/rusefi_hw_enums.h
 
@@ -43,7 +43,7 @@ java -DSystemOut.name=gen_config_board \
 	-ts_output_name rusefi_${SHORT_BOARDNAME}.ini \
 	-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
 	-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-	-prepend tunerstudio/${BOARDNAME}_prefix.txt \
+	-prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
 	-prepend config/boards/${BOARDNAME}/prepend.txt
 
 java -DSystemOut.name=gen_config_board \
@@ -57,7 +57,7 @@ java -DSystemOut.name=gen_config_board \
 	-ts_output_name rusefi_${BOARDNAME}.ini \
 	-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
 	-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-	-prepend tunerstudio/${BOARDNAME}_prefix.txt \
+	-prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
 	-prepend config/boards/${BOARDNAME}/prepend.txt
 
 [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }
diff --git a/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java b/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java
index 9aa126ea7c..835ce8eb85 100644
--- a/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java
+++ b/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java
@@ -24,11 +24,9 @@ public class BoardReader {
     private static final String KEY_BOARD_NAME = "-board";
     private static final String YAML_INPUT_NAME = "-yaml";
     private static final String OUTPUT_FILE_NAME = "-output_file";
-    private static final String KEY_OUTFOLDER = "-out";
     private static final String KEY_FIRMWARE_PATH = "-firmware_path";
     private final static String KEY_ENUM_INPUT_FILE = "-enumInputFile";
 
-    private static final String OUTPUT_FILE_PREFIX = "_prefix.txt";
     private static final String MAPPING_YAML = "mapping.yaml";
 
     public static void main(String[] args) throws IOException {
@@ -41,7 +39,6 @@ public class BoardReader {
         }
         String boardName = null;
         String firmwarePath = "firmware";
-        String outputPath = ".";
         String yamlInputFile = null;
         String outputFileName = null;
         for (int i = 0; i < args.length - 1; i += 2) {
@@ -58,8 +55,6 @@ public class BoardReader {
             } else if (key.equals(KEY_ENUM_INPUT_FILE)) {
                 String inputFile = args[i + 1];
                 EnumsReader.process(new FileReader(firmwarePath + File.separator + inputFile));
-            } else if (key.equals(KEY_OUTFOLDER)) {
-                outputPath = args[i + 1];
             }
         }
 
@@ -70,8 +65,6 @@ public class BoardReader {
         } else {
             SystemOut.println(data);
 
-            if (outputFileName == null)
-                outputFileName = outputPath + File.separator + boardName + OUTPUT_FILE_PREFIX;
             Output bw = new LazyFile(outputFileName);
 
             bw.write(processSection(data, "brain_pin_e", "output_pin_e", "outputs", "GPIO_UNASSIGNED"));