diff --git a/firmware/.cproject b/firmware/.cproject
index 967ab67bd7..2b761b8cec 100644
--- a/firmware/.cproject
+++ b/firmware/.cproject
@@ -69,7 +69,6 @@
-
@@ -123,7 +122,6 @@
-
@@ -347,7 +345,6 @@
-
@@ -396,7 +393,6 @@
-
@@ -519,7 +515,6 @@
-
@@ -637,7 +632,6 @@
-
@@ -691,7 +685,6 @@
-
diff --git a/firmware/Makefile b/firmware/Makefile
index 35d0e1d7ae..f6435bdc83 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -112,7 +112,7 @@ include $(PROJECT_DIR)/controllers/sensors/sensors.mk
include $(PROJECT_DIR)/controllers/system/system.mk
include $(PROJECT_DIR)/controllers/trigger/trigger.mk
include $(PROJECT_DIR)/console/console.mk
-include $(PROJECT_DIR)/console_util/console_util.mk
+include $(PROJECT_DIR)/util/console_util.mk
# Define linker script file here
@@ -198,7 +198,6 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
ext \
ext_algo \
util \
- console_util \
console \
console/binary \
hw_layer \
diff --git a/firmware/console_util/console_util.mk b/firmware/console_util/console_util.mk
deleted file mode 100644
index 18660005bd..0000000000
--- a/firmware/console_util/console_util.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-CONSOLEUTILSRC = $(PROJECT_DIR)/console_util/rfiutil.c
\ No newline at end of file
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 426644448c..bfd083095c 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -372,7 +372,9 @@ void initHardware(Logging *l) {
initVehicleSpeed(sharedLogger);
#endif
+#if HAL_USE_EXT || defined(__DOXYGEN__)
initJoystick(sharedLogger);
+#endif
calcFastAdcIndexes();
engine->addConfigurationListener(adcConfigListener);
diff --git a/firmware/iar/ch.ewp b/firmware/iar/ch.ewp
index 153faea7e7..6382382a67 100644
--- a/firmware/iar/ch.ewp
+++ b/firmware/iar/ch.ewp
@@ -329,7 +329,6 @@
$PROJ_DIR$\..\config\engines
$PROJ_DIR$\..\config\stm32f4ems
$PROJ_DIR$\..\console\binary
- $PROJ_DIR$\..\console_util
$PROJ_DIR$\..\development
$PROJ_DIR$\..\development\test
$PROJ_DIR$\..\development\hw_layer
@@ -2173,15 +2172,6 @@
$PROJ_DIR$\..\console\status_loop.h
-
- console_util
-
- $PROJ_DIR$\..\console_util\rfiutil.c
-
-
- $PROJ_DIR$\..\console_util\rfiutil.h
-
-
controllers
@@ -2265,7 +2255,7 @@
$PROJ_DIR$\..\controllers\algo\main_trigger_callback.h
- $PROJ_DIR$\..\controllers\algo\malfunction_central.c
+ $PROJ_DIR$\..\controllers\algo\malfunction_central.cpp
$PROJ_DIR$\..\controllers\algo\malfunction_central.h
@@ -3333,6 +3323,12 @@
util
+
+ $PROJ_DIR$\..\util\rfiutil.c
+
+
+ $PROJ_DIR$\..\util\rfiutil.h
+
$PROJ_DIR$\..\util\cli_registry.cpp
diff --git a/firmware/util/console_util.mk b/firmware/util/console_util.mk
new file mode 100644
index 0000000000..9d01aa66da
--- /dev/null
+++ b/firmware/util/console_util.mk
@@ -0,0 +1,2 @@
+
+CONSOLEUTILSRC = $(PROJECT_DIR)/rfiutil.c
\ No newline at end of file
diff --git a/firmware/console_util/rfiutil.c b/firmware/util/rfiutil.c
similarity index 100%
rename from firmware/console_util/rfiutil.c
rename to firmware/util/rfiutil.c
diff --git a/firmware/console_util/rfiutil.h b/firmware/util/rfiutil.h
similarity index 100%
rename from firmware/console_util/rfiutil.h
rename to firmware/util/rfiutil.h
diff --git a/win32_functional_tests/Makefile b/win32_functional_tests/Makefile
index ab239be2f6..c4ad5a152b 100644
--- a/win32_functional_tests/Makefile
+++ b/win32_functional_tests/Makefile
@@ -80,7 +80,7 @@ include $(PROJECT_DIR)/controllers/trigger/trigger.mk
include $(PROJECT_DIR)/controllers/system/system.mk
include $(PROJECT_DIR)/console/console.mk
include $(PROJECT_DIR)/console/binary/tunerstudio.mk
-include $(PROJECT_DIR)/console_util/console_util.mk
+include $(PROJECT_DIR)/util/console_util.mk
include $(PROJECT_DIR)/development/development.mk
include $(CHIBIOS)/boards/simulator/board.mk
@@ -167,7 +167,6 @@ $(PORTINC) $(KERNINC) $(TESTINC) \
$(PROJECT_DIR)/util \
$(PROJECT_DIR)/console \
$(PROJECT_DIR)/console/binary \
- $(PROJECT_DIR)/console_util \
$(PROJECT_DIR)/config/engines \
$(PROJECT_DIR)/ext_algo \
$(PROJECT_DIR)/controllers \