diff --git a/firmware/.cproject b/firmware/.cproject
index 02d5be253e..99f4a0717d 100644
--- a/firmware/.cproject
+++ b/firmware/.cproject
@@ -59,7 +59,7 @@
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../util&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../console&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../console/tunerstudio&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
@@ -120,7 +120,7 @@
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../util&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../console&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../console/tunerstudio&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
@@ -351,7 +351,7 @@
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../util&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../console&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../console/tunerstudio&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
@@ -407,7 +407,7 @@
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/various&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../util&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../console&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../console/tunerstudio&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
@@ -532,7 +532,7 @@
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/various&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../util&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../console&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../console/tunerstudio&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
@@ -588,7 +588,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="chibios/boards/ST_STM32F0_DISCOVERY|chibios/os/hal/platforms/STM32/OTGv1|chibios/os/hal/platforms/STM32/RTCv2|chibios/os/hal/platforms/STM32/I2Cv2|chibios/os/ports/GCC/ARMCMx/chcore_v6m.c|chibios/os/ports/GCC/ARMCMx/STM32F0xx|console/status_loop.cpp|controllers/settings.cpp|controllers/flash_main.cpp|development|hw_layer/joystick.cpp|hw_layer/servo.cpp|hw_layer/pin_repository.c|hw_layer/microsecond_timer.c|hw_layer/io_pins.cpp|hw_layer/flash.c|hw_layer/adc_inputs.cpp|hw_layer/gpio_helper.cpp|hw_layer/board_test.cpp|chibios/os/hal/platforms/STM32/USARTv2|chibios/os/hal/platforms/STM32/SPIv2|chibios/os/hal/platforms/STM32/GPIOv2|chibios/os/hal/platforms/STM32F0xx|chibios/os/various/fatfs_bindings|util/LocalVersionHolder.cpp|util/histogram.c|util/data_buffer.c|util/cyclic_buffer.cpp|controllers/algo|controllers/system/SingleTimerExecutor.cpp|controllers/system/signal_executor_sleep.c|controllers/system/pwm_generator_logic.cpp|controllers/system/event_queue.cpp|chibios/ext/fatfs|config/engines|hw_layer/rtc_helper.c|hw_layer/mmc_card.c|hw_layer/neo6m.c|hw_layer/lcd|controllers/core|controllers/math|controllers/sensors|controllers/trigger|controllers/sensors/tps.cpp|controllers/sensors/thermistors.cpp|controllers/sensors/map.cpp|controllers/sensors/maf.cpp|controllers/sensors/ego.cpp|hw_layer/wave_analyzer_hw.c|hw_layer/vehicle_speed.cpp|hw_layer/trigger_input.cpp|hw_layer/stepper.cpp|hw_layer/pwm_generator.cpp|hw_layer/HIP9011.cpp|controllers/map_multiplier_thread.cpp|controllers/map_averaging.cpp|controllers/malfunction_indicator.cpp|controllers/lcd_controller.cpp|controllers/injector_central.cpp|console/tunerstudio|controllers/idle_thread.cpp|controllers/electronic_throttle.cpp|controllers/alternatorController.cpp|controllers/engine_controller.cpp|rusefi.cpp|chibios/boards/ST_STM32F4_DISCOVERY|hw_layer/stm32f4|chibios/os/ports/GCC/ARMCMx/STM32F4xx|chibios/os/hal/platforms/STM32F4xx|config/stm32f4ems|chibios/boards/simulator|chibios/boards/OLIMEX_STM32_E407|chibios/os/ports/IAR|chibios/os/hal/platforms/Win32|chibios/os/ports/GCC/SIMIA32|chibios/os/ports/IAR/ARMCMx/chcore_v6m.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="chibios/boards/ST_STM32F0_DISCOVERY|chibios/os/hal/platforms/STM32/OTGv1|chibios/os/hal/platforms/STM32/RTCv2|chibios/os/hal/platforms/STM32/I2Cv2|chibios/os/ports/GCC/ARMCMx/chcore_v6m.c|chibios/os/ports/GCC/ARMCMx/STM32F0xx|console/status_loop.cpp|controllers/settings.cpp|controllers/flash_main.cpp|development|hw_layer/joystick.cpp|hw_layer/servo.cpp|hw_layer/pin_repository.c|hw_layer/microsecond_timer.c|hw_layer/io_pins.cpp|hw_layer/flash.c|hw_layer/adc_inputs.cpp|hw_layer/gpio_helper.cpp|hw_layer/board_test.cpp|chibios/os/hal/platforms/STM32/USARTv2|chibios/os/hal/platforms/STM32/SPIv2|chibios/os/hal/platforms/STM32/GPIOv2|chibios/os/hal/platforms/STM32F0xx|chibios/os/various/fatfs_bindings|util/LocalVersionHolder.cpp|util/histogram.c|util/data_buffer.c|util/cyclic_buffer.cpp|controllers/algo|controllers/system/SingleTimerExecutor.cpp|controllers/system/signal_executor_sleep.c|controllers/system/pwm_generator_logic.cpp|controllers/system/event_queue.cpp|chibios/ext/fatfs|config/engines|hw_layer/rtc_helper.c|hw_layer/mmc_card.c|hw_layer/neo6m.c|hw_layer/lcd|controllers/core|controllers/math|controllers/sensors|controllers/trigger|controllers/sensors/tps.cpp|controllers/sensors/thermistors.cpp|controllers/sensors/map.cpp|controllers/sensors/maf.cpp|controllers/sensors/ego.cpp|hw_layer/wave_analyzer_hw.c|hw_layer/vehicle_speed.cpp|hw_layer/trigger_input.cpp|hw_layer/stepper.cpp|hw_layer/pwm_generator.cpp|hw_layer/HIP9011.cpp|controllers/map_multiplier_thread.cpp|controllers/map_averaging.cpp|controllers/malfunction_indicator.cpp|controllers/lcd_controller.cpp|controllers/injector_central.cpp|console/binary|controllers/idle_thread.cpp|controllers/electronic_throttle.cpp|controllers/alternatorController.cpp|controllers/engine_controller.cpp|rusefi.cpp|chibios/boards/ST_STM32F4_DISCOVERY|hw_layer/stm32f4|chibios/os/ports/GCC/ARMCMx/STM32F4xx|chibios/os/hal/platforms/STM32F4xx|config/stm32f4ems|chibios/boards/simulator|chibios/boards/OLIMEX_STM32_E407|chibios/os/ports/IAR|chibios/os/hal/platforms/Win32|chibios/os/ports/GCC/SIMIA32|chibios/os/ports/IAR/ARMCMx/chcore_v6m.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -652,7 +652,7 @@
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../util&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../console&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../console/tunerstudio&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
@@ -713,7 +713,7 @@
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../util&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../console&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../console/tunerstudio&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
diff --git a/firmware/Makefile b/firmware/Makefile
index cb276222e9..4f1ec5eeb5 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -94,7 +94,7 @@ include $(CHIBIOS)/os/kernel/kernel.mk
 #include $(CHIBIOS)/os/various/cpp_wrappers/kernel.mk
 
 include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
-include console/tunerstudio/tunerstudio.mk
+include console/binary/tunerstudio.mk
 include ext/ext.mk
 include hw_layer/hw_layer.mk
 include development/development.mk
@@ -197,7 +197,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
 	util \
 	console_util \
 	console \
-	console/tunerstudio \
+	console/binary \
 	hw_layer \
 	hw_layer/serial_over_usb \
 	hw_layer/algo \
diff --git a/firmware/console/tunerstudio/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
similarity index 100%
rename from firmware/console/tunerstudio/tunerstudio.cpp
rename to firmware/console/binary/tunerstudio.cpp
diff --git a/firmware/console/tunerstudio/tunerstudio.h b/firmware/console/binary/tunerstudio.h
similarity index 100%
rename from firmware/console/tunerstudio/tunerstudio.h
rename to firmware/console/binary/tunerstudio.h
diff --git a/firmware/console/binary/tunerstudio.mk b/firmware/console/binary/tunerstudio.mk
new file mode 100644
index 0000000000..6620966dd2
--- /dev/null
+++ b/firmware/console/binary/tunerstudio.mk
@@ -0,0 +1,3 @@
+
+TUNERSTUDIO_SRC_CPP = $(PROJECT_DIR)/console/binary/tunerstudio_io.cpp \
+	$(PROJECT_DIR)/console/binary/tunerstudio.cpp 
diff --git a/firmware/console/tunerstudio/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h
similarity index 100%
rename from firmware/console/tunerstudio/tunerstudio_configuration.h
rename to firmware/console/binary/tunerstudio_configuration.h
diff --git a/firmware/console/tunerstudio/tunerstudio_io.cpp b/firmware/console/binary/tunerstudio_io.cpp
similarity index 100%
rename from firmware/console/tunerstudio/tunerstudio_io.cpp
rename to firmware/console/binary/tunerstudio_io.cpp
diff --git a/firmware/console/tunerstudio/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h
similarity index 100%
rename from firmware/console/tunerstudio/tunerstudio_io.h
rename to firmware/console/binary/tunerstudio_io.h
diff --git a/firmware/console/tunerstudio/tunerstudio.mk b/firmware/console/tunerstudio/tunerstudio.mk
deleted file mode 100644
index 0d9ecefc98..0000000000
--- a/firmware/console/tunerstudio/tunerstudio.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-
-TUNERSTUDIO_SRC_CPP = $(PROJECT_DIR)/console/tunerstudio/tunerstudio_io.cpp \
-	$(PROJECT_DIR)/console/tunerstudio/tunerstudio.cpp 
diff --git a/firmware/svnversion.h b/firmware/svnversion.h
index 3fb6813aa8..d448e5c2fb 100644
--- a/firmware/svnversion.h
+++ b/firmware/svnversion.h
@@ -1,5 +1,5 @@
 // This file was generated by Version2Header
-// Sun Mar 01 09:49:22 EST 2015
+// Mon Mar 09 11:02:28 EDT 2015
 #ifndef VCS_VERSION
-#define VCS_VERSION "7208"
+#define VCS_VERSION "7345"
 #endif