diff --git a/Source/hoc-clk/common/include/hocclk.h b/Source/hoc-clk/common/include/hocclk.h
index 3324c9ec..f8d1d4bb 100644
--- a/Source/hoc-clk/common/include/hocclk.h
+++ b/Source/hoc-clk/common/include/hocclk.h
@@ -48,7 +48,6 @@ extern "C" {
 #include "hocclk/apm.h"
 #include "hocclk/config.h"
 #include "hocclk/errors.h"
-#include "hocclk/psm_ext.h"
 #include "hocclk/result.hpp"
 
 #ifdef __cplusplus
diff --git a/Source/hoc-clk/overlay/src/main.cpp b/Source/hoc-clk/overlay/src/main.cpp
index d6ac8027..579ae30e 100644
--- a/Source/hoc-clk/overlay/src/main.cpp
+++ b/Source/hoc-clk/overlay/src/main.cpp
@@ -29,7 +29,6 @@
 #include <tesla.hpp>
 #include "ui/gui/fatal_gui.h"
 #include "ui/gui/main_gui.h"
-#include "rgltr_services.h"  // for extern Service g_rgltrSrv, etc.
 
 class AppOverlay : public tsl::Overlay
 {
@@ -42,7 +41,6 @@ class AppOverlay : public tsl::Overlay
         //}
 
         virtual void exitServices() override {
-            rgltrExit();
             hocclkIpcExit();
         }
 
diff --git a/Source/hoc-clk/overlay/src/ui/gui/misc_gui.cpp b/Source/hoc-clk/overlay/src/ui/gui/misc_gui.cpp
index f0f86ce7..30f213a8 100644
--- a/Source/hoc-clk/overlay/src/ui/gui/misc_gui.cpp
+++ b/Source/hoc-clk/overlay/src/ui/gui/misc_gui.cpp
@@ -22,7 +22,6 @@
 #include <cstdio>
 #include <cstring>
 #include <vector>
-#include <notification.h>
 #include "labels.h"
 
 // This workaround *may* not be nessasary, but it seems to help with reducing stutter
diff --git a/Source/hoc-clk/sysmodule/Makefile b/Source/hoc-clk/sysmodule/Makefile
index 8badec94..b4c7418a 100644
--- a/Source/hoc-clk/sysmodule/Makefile
+++ b/Source/hoc-clk/sysmodule/Makefile
@@ -22,11 +22,11 @@ CONFIG_DIR	:=	horizon-oc
 BUILD		:=	build
 OUTDIR		:=	out
 RESOURCES	:=	res
-SOURCES		:=	src src/nx/ipc ../common/src src/board src/display src/tsensor
+SOURCES		:=	src src/hos src/i2c src/ipc src/board src/display src/tsensor src/mgr src/file src/soc src/mapping src/pwr src/util
 DATA		:=	data
-INCLUDES	:=	../common/include
+INCLUDES	:=	../common/include src/hos src/soc src/i2c src/util src/pwr src/ipc
 EXEFS_SRC	:=	exefs_src
-LIBNAMES	:=	minIni nxExt
+LIBNAMES	:=	minIni
 # major minor patch
 KIP_VERSION :=  220
 CUST_REV    :=  2
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/.gitignore b/Source/hoc-clk/sysmodule/lib/nxExt/.gitignore
deleted file mode 100644
index 0806f7bf..00000000
--- a/Source/hoc-clk/sysmodule/lib/nxExt/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-# Editor files
-*.swp
-*~
-
-# Objects
-*.o
-*.a
-*.so
-
-# Lib
-lib
-release
-debug
\ No newline at end of file
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/Makefile b/Source/hoc-clk/sysmodule/lib/nxExt/Makefile
deleted file mode 100644
index 34be0db8..00000000
--- a/Source/hoc-clk/sysmodule/lib/nxExt/Makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
-endif
-
-include $(DEVKITPRO)/libnx/switch_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-SOURCES		:=	src
-DATA		:=	data
-INCLUDES	:=	include
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIC -ftls-model=local-exec
-
-CFLAGS	:=	-g -Wall -Werror \
-			-ffunction-sections \
-			-fdata-sections \
-			$(ARCH) \
-			$(BUILD_CFLAGS)
-
-CFLAGS	+=	$(INCLUDE) -std=gnu11
-
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions
-
-ASFLAGS	:=	-g $(ARCH)
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS := $(PORTLIBS) $(LIBNX)
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
-export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
-export HFILES	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I$(CURDIR)/$(BUILD)
-
-.PHONY: clean all lib/lib$(TARGET).a lib/lib$(TARGET)d.a
-
-#---------------------------------------------------------------------------------
-all: lib/lib$(TARGET).a lib/lib$(TARGET)d.a
-
-lib:
-	@[ -d $@ ] || mkdir -p $@
-
-release:
-	@[ -d $@ ] || mkdir -p $@
-
-debug:
-	@[ -d $@ ] || mkdir -p $@
-
-lib/lib$(TARGET).a : lib release $(SOURCES) $(INCLUDES)
-	@$(MAKE) BUILD=release OUTPUT=$(CURDIR)/$@ \
-	BUILD_CFLAGS="-DNDEBUG=1 -O2" \
-	DEPSDIR=$(CURDIR)/release \
-	--no-print-directory -C release \
-	-f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr release debug lib
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT)	:	$(OFILES)
-
-$(OFILES_SRC)	: $(HFILES)
-
-#---------------------------------------------------------------------------------
-%_bin.h %.bin.o	:	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt.h b/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt.h
deleted file mode 100644
index 29369887..00000000
--- a/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
- 
-/* --------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <p-sam@d3vs.net>, <natinusala@gmail.com>, <m4x@m4xw.net>
- * wrote this file. As long as you retain this notice you can do whatever you
- * want with this stuff. If you meet any of us some day, and you think this
- * stuff is worth it, you can buy us a beer in return.  - The sys-clk authors
- * --------------------------------------------------------------------------
- */
-
-
-#pragma once
-
-#include "nxExt/apm_ext.h"
-#include "nxExt/i2c.h"
-#include "nxExt/t210.h"
-#include "nxExt/max17050.h"
-#include "nxExt/tmp451.h"
-#include "nxExt/ipc_server.h"
-#include "nxExt/cpp/lockable_mutex.h"
diff --git a/Source/hoc-clk/sysmodule/src/board/board.cpp b/Source/hoc-clk/sysmodule/src/board/board.cpp
index 303f0fb7..bd5068b1 100644
--- a/Source/hoc-clk/sysmodule/src/board/board.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board.cpp
@@ -24,13 +24,19 @@
  * --------------------------------------------------------------------------
  */
 
-#include <nxExt.h>
+#include "../hos/apm_ext.h"
+#include <i2c.h>
+#include <t210.h>
+#include <max17050.h>
+#include <tmp451.h>
+#include <ipc_server.h>
+#include <lockable_mutex.h>
 #include <hocclk.h>
 #include <switch.h>
 #include <pwm.h>
 #include <registers.h>
 #include <battery.h>
-#include "display_refresh_rate.hpp"
+#include "../display/display_refresh_rate.hpp"
 #include <rgltr.h>
 #include <notification.h>
 
@@ -41,8 +47,8 @@
 #include "board_misc.hpp"
 #include "../tsensor/soctherm.hpp"
 #include "../tsensor/aotag.hpp"
-#include "../integrations.hpp"
-#include "../file_utils.hpp"
+#include "../hos/integrations.hpp"
+#include "../file/file_utils.hpp"
 namespace board {
 
     u64 clkVirtAddr, dsiVirtAddr, apbVirtAddr, fuseVirtAddr;
diff --git a/Source/hoc-clk/sysmodule/src/board/board.hpp b/Source/hoc-clk/sysmodule/src/board/board.hpp
index 16d9d0da..266f87db 100644
--- a/Source/hoc-clk/sysmodule/src/board/board.hpp
+++ b/Source/hoc-clk/sysmodule/src/board/board.hpp
@@ -35,7 +35,7 @@
 #include "board_sensor.hpp"
 #include "board_volt.hpp"
 #include "board_profile.hpp"
-#include "../mem_map.hpp"
+#include "../mapping/mem_map.hpp"
 #define HOSSVC_HAS_CLKRST (hosversionAtLeast(8,0,0))
 #define HOSSVC_HAS_TC (hosversionAtLeast(5,0,0))
 
diff --git a/Source/hoc-clk/sysmodule/src/board/board_freq.cpp b/Source/hoc-clk/sysmodule/src/board/board_freq.cpp
index ab50fe39..8fcb7639 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_freq.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_freq.cpp
@@ -26,13 +26,20 @@
 
 #include <switch.h>
 #include <hocclk.h>
-#include <nxExt.h>
-#include "display_refresh_rate.hpp"
+#include "../hos/apm_ext.h"
+#include <i2c.h>
+#include "../i2c/i2cDrv.h"
+#include <t210.h>
+#include <max17050.h>
+#include <tmp451.h>
+#include <ipc_server.h>
+#include <lockable_mutex.h>
+#include "../display/display_refresh_rate.hpp"
 #include "board.hpp"
 #include "board_name.hpp"
-#include "../errors.hpp"
-#include "pllmb.hpp"
-#include "../config.hpp"
+#include "../file/errors.hpp"
+#include "../soc/pllmb.hpp"
+#include "../file/config.hpp"
 namespace board {
 
     PcvModule GetPcvModule(HocClkModule hocclkModule) {
@@ -67,6 +74,7 @@ namespace board {
     }
 
     void SetHz(HocClkModule module, u32 hz) {
+        return;
         Result rc = 0;
         bool usesGovenor = module > HocClkModule_MEM;
 
diff --git a/Source/hoc-clk/sysmodule/src/board/board_freq.hpp b/Source/hoc-clk/sysmodule/src/board/board_freq.hpp
index d176fc69..9804c2c8 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_freq.hpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_freq.hpp
@@ -27,8 +27,14 @@
 #pragma once
 #include <switch.h>
 #include <hocclk.h>
-#include <nxExt.h>
-#include "../errors.hpp"
+#include "../hos/apm_ext.h"
+#include <i2c.h>
+#include <t210.h>
+#include <max17050.h>
+#include <tmp451.h>
+#include <ipc_server.h>
+#include <lockable_mutex.h>
+#include "../file/errors.hpp"
 
 namespace board {
 
diff --git a/Source/hoc-clk/sysmodule/src/board/board_load.cpp b/Source/hoc-clk/sysmodule/src/board/board_load.cpp
index faf034ec..8428b62a 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_load.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_load.cpp
@@ -26,7 +26,13 @@
 
 #include <switch.h>
 #include <hocclk.h>
-#include <nxExt.h>
+#include "../hos/apm_ext.h"
+#include <i2c.h>
+#include <t210.h>
+#include <max17050.h>
+#include <tmp451.h>
+#include <ipc_server.h>
+#include <lockable_mutex.h>
 #include <algorithm>
 #include <math.h>
 #include <numeric>
diff --git a/Source/hoc-clk/sysmodule/src/board/board_profile.cpp b/Source/hoc-clk/sysmodule/src/board/board_profile.cpp
index aa37ae26..4a43b32a 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_profile.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_profile.cpp
@@ -26,7 +26,13 @@
 
 #include <switch.h>
 #include <hocclk.h>
-#include <nxExt.h>
+#include "../hos/apm_ext.h"
+#include <i2c.h>
+#include <t210.h>
+#include <max17050.h>
+#include <tmp451.h>
+#include <ipc_server.h>
+#include <lockable_mutex.h>
 #include "board.hpp"
 
 namespace board {
diff --git a/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp b/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp
index a90e3c36..f7fc3492 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp
@@ -26,7 +26,14 @@
 
 #include <hocclk.h>
 #include <switch.h>
-#include <nxExt.h>
+#include "../hos/apm_ext.h"
+#include <i2c.h>
+#include "../i2c/i2cDrv.h"
+#include <t210.h>
+#include <max17050.h>
+#include <tmp451.h>
+#include <ipc_server.h>
+#include <lockable_mutex.h>
 #include <cmath>
 #include <battery.h>
 #include <pwm.h>
@@ -34,7 +41,7 @@
 #include "../tsensor/soctherm.hpp"
 #include "../tsensor/aotag.hpp"
 #include "../tsensor/bq24193.hpp"
-#include "../config.hpp"
+#include "../file/config.hpp"
 
 namespace board {
 
diff --git a/Source/hoc-clk/sysmodule/src/board/board_volt.cpp b/Source/hoc-clk/sysmodule/src/board/board_volt.cpp
index 23a29a49..c7a51fe1 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_volt.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_volt.cpp
@@ -27,7 +27,7 @@
 #include "board.hpp"
 #include "board_freq.hpp"
 #include "board_volt.hpp"
-#include "../file_utils.hpp"
+#include "../file/file_utils.hpp"
 
 namespace board {
 
diff --git a/Source/hoc-clk/sysmodule/src/board/display_refresh_rate.cpp b/Source/hoc-clk/sysmodule/src/display/display_refresh_rate.cpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/board/display_refresh_rate.cpp
rename to Source/hoc-clk/sysmodule/src/display/display_refresh_rate.cpp
diff --git a/Source/hoc-clk/sysmodule/src/board/display_refresh_rate.hpp b/Source/hoc-clk/sysmodule/src/display/display_refresh_rate.hpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/board/display_refresh_rate.hpp
rename to Source/hoc-clk/sysmodule/src/display/display_refresh_rate.hpp
diff --git a/Source/hoc-clk/sysmodule/src/config.cpp b/Source/hoc-clk/sysmodule/src/file/config.cpp
similarity index 98%
rename from Source/hoc-clk/sysmodule/src/config.cpp
rename to Source/hoc-clk/sysmodule/src/file/config.cpp
index 7de0fdd4..7b0d2569 100644
--- a/Source/hoc-clk/sysmodule/src/config.cpp
+++ b/Source/hoc-clk/sysmodule/src/file/config.cpp
@@ -37,8 +37,14 @@
 #include <atomic>
 #include <initializer_list>
 #include <minIni.h>
-#include <nxExt.h>
-#include "board/board.hpp"
+#include "../hos/apm_ext.h"
+#include <i2c.h>
+#include <t210.h>
+#include <max17050.h>
+#include <tmp451.h>
+#include <ipc_server.h>
+#include <lockable_mutex.h>
+#include "../board/board.hpp"
 #include "errors.hpp"
 #include "file_utils.hpp"
 
diff --git a/Source/hoc-clk/sysmodule/src/config.hpp b/Source/hoc-clk/sysmodule/src/file/config.hpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/config.hpp
rename to Source/hoc-clk/sysmodule/src/file/config.hpp
diff --git a/Source/hoc-clk/sysmodule/src/errors.cpp b/Source/hoc-clk/sysmodule/src/file/errors.cpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/errors.cpp
rename to Source/hoc-clk/sysmodule/src/file/errors.cpp
diff --git a/Source/hoc-clk/sysmodule/src/errors.hpp b/Source/hoc-clk/sysmodule/src/file/errors.hpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/errors.hpp
rename to Source/hoc-clk/sysmodule/src/file/errors.hpp
diff --git a/Source/hoc-clk/sysmodule/src/file_utils.cpp b/Source/hoc-clk/sysmodule/src/file/file_utils.cpp
similarity index 97%
rename from Source/hoc-clk/sysmodule/src/file_utils.cpp
rename to Source/hoc-clk/sysmodule/src/file/file_utils.cpp
index 366bad68..d7693016 100644
--- a/Source/hoc-clk/sysmodule/src/file_utils.cpp
+++ b/Source/hoc-clk/sysmodule/src/file/file_utils.cpp
@@ -25,7 +25,13 @@
  */
 
 #include "file_utils.hpp"
-#include <nxExt.h>
+#include "../hos/apm_ext.h"
+#include <i2c.h>
+#include <t210.h>
+#include <max17050.h>
+#include <tmp451.h>
+#include <ipc_server.h>
+#include <lockable_mutex.h>
 
 extern "C" void __libnx_init_time(void);
 
diff --git a/Source/hoc-clk/sysmodule/src/file_utils.hpp b/Source/hoc-clk/sysmodule/src/file/file_utils.hpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/file_utils.hpp
rename to Source/hoc-clk/sysmodule/src/file/file_utils.hpp
diff --git a/Source/hoc-clk/sysmodule/src/kip.cpp b/Source/hoc-clk/sysmodule/src/file/kip.cpp
similarity index 99%
rename from Source/hoc-clk/sysmodule/src/kip.cpp
rename to Source/hoc-clk/sysmodule/src/file/kip.cpp
index 79c9c244..d4e4c69d 100644
--- a/Source/hoc-clk/sysmodule/src/kip.cpp
+++ b/Source/hoc-clk/sysmodule/src/file/kip.cpp
@@ -16,9 +16,10 @@
  */
 
 #include "kip.hpp"
-#include "board/board.hpp"
+#include "../i2c/i2cDrv.h"
+#include "../board/board.hpp"
 #include "file_utils.hpp"
-#include "clock_manager.hpp"
+#include "../mgr/clock_manager.hpp"
 
 namespace kip {
 
diff --git a/Source/hoc-clk/sysmodule/src/kip.hpp b/Source/hoc-clk/sysmodule/src/file/kip.hpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/kip.hpp
rename to Source/hoc-clk/sysmodule/src/file/kip.hpp
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/src/apm_ext.c b/Source/hoc-clk/sysmodule/src/hos/apm_ext.c
similarity index 98%
rename from Source/hoc-clk/sysmodule/lib/nxExt/src/apm_ext.c
rename to Source/hoc-clk/sysmodule/src/hos/apm_ext.c
index fba71f4f..1448cfde 100644
--- a/Source/hoc-clk/sysmodule/lib/nxExt/src/apm_ext.c
+++ b/Source/hoc-clk/sysmodule/src/hos/apm_ext.c
@@ -25,7 +25,7 @@
  */
 
 
-#include "nxExt/apm_ext.h"
+#include "apm_ext.h"
 
 #include <stdatomic.h>
 
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/apm_ext.h b/Source/hoc-clk/sysmodule/src/hos/apm_ext.h
similarity index 100%
rename from Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/apm_ext.h
rename to Source/hoc-clk/sysmodule/src/hos/apm_ext.h
diff --git a/Source/hoc-clk/common/src/apm_profile_table.c b/Source/hoc-clk/sysmodule/src/hos/apm_profile_table.c
similarity index 100%
rename from Source/hoc-clk/common/src/apm_profile_table.c
rename to Source/hoc-clk/sysmodule/src/hos/apm_profile_table.c
diff --git a/Source/hoc-clk/sysmodule/src/integrations.cpp b/Source/hoc-clk/sysmodule/src/hos/integrations.cpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/integrations.cpp
rename to Source/hoc-clk/sysmodule/src/hos/integrations.cpp
diff --git a/Source/hoc-clk/sysmodule/src/integrations.hpp b/Source/hoc-clk/sysmodule/src/hos/integrations.hpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/integrations.hpp
rename to Source/hoc-clk/sysmodule/src/hos/integrations.hpp
diff --git a/Source/hoc-clk/common/src/notification.cpp b/Source/hoc-clk/sysmodule/src/hos/notification.cpp
similarity index 100%
rename from Source/hoc-clk/common/src/notification.cpp
rename to Source/hoc-clk/sysmodule/src/hos/notification.cpp
diff --git a/Source/hoc-clk/common/include/notification.h b/Source/hoc-clk/sysmodule/src/hos/notification.h
similarity index 100%
rename from Source/hoc-clk/common/include/notification.h
rename to Source/hoc-clk/sysmodule/src/hos/notification.h
diff --git a/Source/hoc-clk/common/include/pcv_types.h b/Source/hoc-clk/sysmodule/src/hos/pcv_types.h
similarity index 100%
rename from Source/hoc-clk/common/include/pcv_types.h
rename to Source/hoc-clk/sysmodule/src/hos/pcv_types.h
diff --git a/Source/hoc-clk/sysmodule/src/process_management.cpp b/Source/hoc-clk/sysmodule/src/hos/process_management.cpp
similarity index 98%
rename from Source/hoc-clk/sysmodule/src/process_management.cpp
rename to Source/hoc-clk/sysmodule/src/hos/process_management.cpp
index 1d3ffbdd..d3bbb8ab 100644
--- a/Source/hoc-clk/sysmodule/src/process_management.cpp
+++ b/Source/hoc-clk/sysmodule/src/hos/process_management.cpp
@@ -26,8 +26,8 @@
 
 
 #include "process_management.hpp"
-#include "file_utils.hpp"
-#include "errors.hpp"
+#include "../file/file_utils.hpp"
+#include "../file/errors.hpp"
 #include <cstring>
 
 namespace processManagement {
diff --git a/Source/hoc-clk/sysmodule/src/process_management.hpp b/Source/hoc-clk/sysmodule/src/hos/process_management.hpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/process_management.hpp
rename to Source/hoc-clk/sysmodule/src/hos/process_management.hpp
diff --git a/Source/hoc-clk/common/src/psm_ext.c b/Source/hoc-clk/sysmodule/src/hos/psm_ext.c
similarity index 98%
rename from Source/hoc-clk/common/src/psm_ext.c
rename to Source/hoc-clk/sysmodule/src/hos/psm_ext.c
index 3a5fa62c..e21faf05 100644
--- a/Source/hoc-clk/common/src/psm_ext.c
+++ b/Source/hoc-clk/sysmodule/src/hos/psm_ext.c
@@ -15,7 +15,7 @@
  * 
  */
  
-#include <hocclk/psm_ext.h>
+#include "psm_ext.h"
 
 const char* PsmPowerRoleToStr(PsmPowerRole role) {
     switch (role) {
diff --git a/Source/hoc-clk/common/include/hocclk/psm_ext.h b/Source/hoc-clk/sysmodule/src/hos/psm_ext.h
similarity index 100%
rename from Source/hoc-clk/common/include/hocclk/psm_ext.h
rename to Source/hoc-clk/sysmodule/src/hos/psm_ext.h
diff --git a/Source/hoc-clk/common/src/pwm.c b/Source/hoc-clk/sysmodule/src/hos/pwm.c
similarity index 97%
rename from Source/hoc-clk/common/src/pwm.c
rename to Source/hoc-clk/sysmodule/src/hos/pwm.c
index 96475997..09c14268 100644
--- a/Source/hoc-clk/common/src/pwm.c
+++ b/Source/hoc-clk/sysmodule/src/hos/pwm.c
@@ -17,7 +17,7 @@
 
 #define NX_SERVICE_ASSUME_NON_DOMAIN
 #include <switch.h>
-#include "service_guard.h"
+#include "../util/service_guard.h"
 #include "pwm.h"
 
 static Service g_pwmSrv;
diff --git a/Source/hoc-clk/common/include/pwm.h b/Source/hoc-clk/sysmodule/src/hos/pwm.h
similarity index 100%
rename from Source/hoc-clk/common/include/pwm.h
rename to Source/hoc-clk/sysmodule/src/hos/pwm.h
diff --git a/Source/hoc-clk/common/include/rgltr.h b/Source/hoc-clk/sysmodule/src/hos/rgltr.h
similarity index 100%
rename from Source/hoc-clk/common/include/rgltr.h
rename to Source/hoc-clk/sysmodule/src/hos/rgltr.h
diff --git a/Source/hoc-clk/common/src/rgltr_services.cpp b/Source/hoc-clk/sysmodule/src/hos/rgltr_services.cpp
similarity index 100%
rename from Source/hoc-clk/common/src/rgltr_services.cpp
rename to Source/hoc-clk/sysmodule/src/hos/rgltr_services.cpp
diff --git a/Source/hoc-clk/common/include/rgltr_services.h b/Source/hoc-clk/sysmodule/src/hos/rgltr_services.h
similarity index 100%
rename from Source/hoc-clk/common/include/rgltr_services.h
rename to Source/hoc-clk/sysmodule/src/hos/rgltr_services.h
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/src/i2c.c b/Source/hoc-clk/sysmodule/src/i2c/i2c.c
similarity index 98%
rename from Source/hoc-clk/sysmodule/lib/nxExt/src/i2c.c
rename to Source/hoc-clk/sysmodule/src/i2c/i2c.c
index d5db4ac1..61d090b7 100644
--- a/Source/hoc-clk/sysmodule/lib/nxExt/src/i2c.c
+++ b/Source/hoc-clk/sysmodule/src/i2c/i2c.c
@@ -25,7 +25,7 @@
  */
 
 
-#include "nxExt/i2c.h"
+#include "i2c.h"
 
 #define I2C_CMD_SND 0
 #define I2C_CMD_RCV 1
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/i2c.h b/Source/hoc-clk/sysmodule/src/i2c/i2c.h
similarity index 100%
rename from Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/i2c.h
rename to Source/hoc-clk/sysmodule/src/i2c/i2c.h
diff --git a/Source/hoc-clk/common/src/i2c.cpp b/Source/hoc-clk/sysmodule/src/i2c/i2cDrv.cpp
similarity index 99%
rename from Source/hoc-clk/common/src/i2c.cpp
rename to Source/hoc-clk/sysmodule/src/i2c/i2cDrv.cpp
index 3760efeb..70bbc287 100644
--- a/Source/hoc-clk/common/src/i2c.cpp
+++ b/Source/hoc-clk/sysmodule/src/i2c/i2cDrv.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-#include "i2c.h"
+#include "i2cDrv.h"
 
 Result I2cSet_U8(I2cDevice dev, u8 reg, u8 val) {
     // ams::fatal::srv::StopSoundTask::StopSound()
diff --git a/Source/hoc-clk/common/include/i2c.h b/Source/hoc-clk/sysmodule/src/i2c/i2cDrv.h
similarity index 100%
rename from Source/hoc-clk/common/include/i2c.h
rename to Source/hoc-clk/sysmodule/src/i2c/i2cDrv.h
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/src/max17050.c b/Source/hoc-clk/sysmodule/src/i2c/max17050.c
similarity index 98%
rename from Source/hoc-clk/sysmodule/lib/nxExt/src/max17050.c
rename to Source/hoc-clk/sysmodule/src/i2c/max17050.c
index fe6d00bc..cecca39c 100644
--- a/Source/hoc-clk/sysmodule/lib/nxExt/src/max17050.c
+++ b/Source/hoc-clk/sysmodule/src/i2c/max17050.c
@@ -22,8 +22,8 @@
  *
  */
 
-#include "nxExt/max17050.h"
-#include "nxExt/i2c.h"
+#include "max17050.h"
+#include "i2c.h"
 
 #define MAX17050_WAIT_NS 1000000000UL
 
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/max17050.h b/Source/hoc-clk/sysmodule/src/i2c/max17050.h
similarity index 100%
rename from Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/max17050.h
rename to Source/hoc-clk/sysmodule/src/i2c/max17050.h
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/src/tmp451.c b/Source/hoc-clk/sysmodule/src/i2c/tmp451.c
similarity index 97%
rename from Source/hoc-clk/sysmodule/lib/nxExt/src/tmp451.c
rename to Source/hoc-clk/sysmodule/src/i2c/tmp451.c
index 90c8d1c2..e465a2c5 100644
--- a/Source/hoc-clk/sysmodule/lib/nxExt/src/tmp451.c
+++ b/Source/hoc-clk/sysmodule/src/i2c/tmp451.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nxExt/tmp451.h"
-#include "nxExt/i2c.h"
+#include "tmp451.h"
+#include "i2c.h"
 
 #define TMP451_WAIT_NS 1000000000UL
 
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/tmp451.h b/Source/hoc-clk/sysmodule/src/i2c/tmp451.h
similarity index 100%
rename from Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/tmp451.h
rename to Source/hoc-clk/sysmodule/src/i2c/tmp451.h
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/src/ipc_server.c b/Source/hoc-clk/sysmodule/src/ipc/ipc_server.c
similarity index 99%
rename from Source/hoc-clk/sysmodule/lib/nxExt/src/ipc_server.c
rename to Source/hoc-clk/sysmodule/src/ipc/ipc_server.c
index 68e92ff8..986612c6 100644
--- a/Source/hoc-clk/sysmodule/lib/nxExt/src/ipc_server.c
+++ b/Source/hoc-clk/sysmodule/src/ipc/ipc_server.c
@@ -25,7 +25,7 @@
  */
 
 
-#include "nxExt/ipc_server.h"
+#include "ipc_server.h"
 #include <string.h>
 
 Result ipcServerInit(IpcServer* server, const char* name, u32 max_sessions)
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/ipc_server.h b/Source/hoc-clk/sysmodule/src/ipc/ipc_server.h
similarity index 100%
rename from Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/ipc_server.h
rename to Source/hoc-clk/sysmodule/src/ipc/ipc_server.h
diff --git a/Source/hoc-clk/sysmodule/src/ipc_service.cpp b/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp
similarity index 97%
rename from Source/hoc-clk/sysmodule/src/ipc_service.cpp
rename to Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp
index ad19c800..34890245 100644
--- a/Source/hoc-clk/sysmodule/src/ipc_service.cpp
+++ b/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp
@@ -27,12 +27,18 @@
 #include "ipc_service.hpp"
 #include <cstring>
 #include <switch.h>
-#include <nxExt.h>
-#include "file_utils.hpp"
-#include "errors.hpp"
-#include "clock_manager.hpp"
-#include "config.hpp"
-#include "kip.hpp"
+#include "../hos/apm_ext.h"
+#include <i2c.h>
+#include <t210.h>
+#include <max17050.h>
+#include <tmp451.h>
+#include <ipc_server.h>
+#include <lockable_mutex.h>
+#include "../file/file_utils.hpp"
+#include "../file/errors.hpp"
+#include "../mgr/clock_manager.hpp"
+#include "../file/config.hpp"
+#include "../file/kip.hpp"
 namespace ipcService {
 
     namespace {
diff --git a/Source/hoc-clk/sysmodule/src/ipc_service.hpp b/Source/hoc-clk/sysmodule/src/ipc/ipc_service.hpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/ipc_service.hpp
rename to Source/hoc-clk/sysmodule/src/ipc/ipc_service.hpp
diff --git a/Source/hoc-clk/sysmodule/src/main.cpp b/Source/hoc-clk/sysmodule/src/main.cpp
index 5bfa6b45..6716e144 100644
--- a/Source/hoc-clk/sysmodule/src/main.cpp
+++ b/Source/hoc-clk/sysmodule/src/main.cpp
@@ -30,13 +30,13 @@
 
 #include <switch.h>
 
-#include "errors.hpp"
-#include "file_utils.hpp"
+#include "file/errors.hpp"
+#include "file/file_utils.hpp"
 #include "board/board.hpp"
-#include "process_management.hpp"
-#include "clock_manager.hpp"
-#include "ipc_service.hpp"
-#include "config.hpp"
+#include "hos/process_management.hpp"
+#include "mgr/clock_manager.hpp"
+#include "ipc/ipc_service.hpp"
+#include "file/config.hpp"
 
 #define INNER_HEAP_SIZE 0x3A000
 
diff --git a/Source/hoc-clk/sysmodule/src/mem_map.cpp b/Source/hoc-clk/sysmodule/src/mapping/mem_map.cpp
similarity index 97%
rename from Source/hoc-clk/sysmodule/src/mem_map.cpp
rename to Source/hoc-clk/sysmodule/src/mapping/mem_map.cpp
index bbaf96db..24081b43 100644
--- a/Source/hoc-clk/sysmodule/src/mem_map.cpp
+++ b/Source/hoc-clk/sysmodule/src/mapping/mem_map.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <switch.h>
-#include "file_utils.hpp"
+#include "../file/file_utils.hpp"
 
 Result QueryMemoryMapping(u64* virtaddr, u64 physaddr, u64 size) {
     if(hosversionAtLeast(10,0,0)) {
diff --git a/Source/hoc-clk/sysmodule/src/mem_map.hpp b/Source/hoc-clk/sysmodule/src/mapping/mem_map.hpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/mem_map.hpp
rename to Source/hoc-clk/sysmodule/src/mapping/mem_map.hpp
diff --git a/Source/hoc-clk/sysmodule/src/clock_manager.cpp b/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp
similarity index 98%
rename from Source/hoc-clk/sysmodule/src/clock_manager.cpp
rename to Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp
index cd170347..75f796cb 100644
--- a/Source/hoc-clk/sysmodule/src/clock_manager.cpp
+++ b/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp
@@ -26,22 +26,23 @@
 
 #include "clock_manager.hpp"
 #include <cstring>
-#include "file_utils.hpp"
-#include "board/board.hpp"
-#include "process_management.hpp"
-#include "errors.hpp"
-#include "ipc_service.hpp"
-#include "kip.hpp"
+#include "../file/file_utils.hpp"
+#include "../board/board.hpp"
+#include "../hos/process_management.hpp"
+#include "../file/errors.hpp"
+#include "../ipc/ipc_service.hpp"
+#include "../file/kip.hpp"
 #include <i2c.h>
-#include "board/display_refresh_rate.hpp"
+#include "../i2c/i2cDrv.h"
+#include "../display/display_refresh_rate.hpp"
 #include <cstdio>
 #include <crc32.h>
-#include "config.hpp"
-#include "integrations.hpp"
-#include <nxExt/cpp/lockable_mutex.h>
-#include "kip.hpp"
+#include "../file/config.hpp"
+#include "../hos/integrations.hpp"
+#include "../util/lockable_mutex.h"
+#include "../file/kip.hpp"
 #include "governor.hpp"
-#include "display/aula.hpp"
+#include "../display/aula.hpp"
 
 #define HOSPPC_HAS_BOOST (hosversionAtLeast(7,0,0))
 
diff --git a/Source/hoc-clk/sysmodule/src/clock_manager.hpp b/Source/hoc-clk/sysmodule/src/mgr/clock_manager.hpp
similarity index 98%
rename from Source/hoc-clk/sysmodule/src/clock_manager.hpp
rename to Source/hoc-clk/sysmodule/src/mgr/clock_manager.hpp
index 8b435db4..34d238d0 100644
--- a/Source/hoc-clk/sysmodule/src/clock_manager.hpp
+++ b/Source/hoc-clk/sysmodule/src/mgr/clock_manager.hpp
@@ -28,7 +28,7 @@
 
 #include <hocclk.h>
 #include <switch.h>
-#include <nxExt/cpp/lockable_mutex.h>
+#include "../util/lockable_mutex.h"
 
 namespace clockManager {
 
diff --git a/Source/hoc-clk/sysmodule/src/governor.cpp b/Source/hoc-clk/sysmodule/src/mgr/governor.cpp
similarity index 99%
rename from Source/hoc-clk/sysmodule/src/governor.cpp
rename to Source/hoc-clk/sysmodule/src/mgr/governor.cpp
index adad03b1..bc554d75 100644
--- a/Source/hoc-clk/sysmodule/src/governor.cpp
+++ b/Source/hoc-clk/sysmodule/src/mgr/governor.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "governor.hpp"
-#include "process_management.hpp"
+#include "../hos/process_management.hpp"
 #include <hocclk/clock_manager.h>
 namespace governor {
 
diff --git a/Source/hoc-clk/sysmodule/src/governor.hpp b/Source/hoc-clk/sysmodule/src/mgr/governor.hpp
similarity index 83%
rename from Source/hoc-clk/sysmodule/src/governor.hpp
rename to Source/hoc-clk/sysmodule/src/mgr/governor.hpp
index 71ca5764..cb560731 100644
--- a/Source/hoc-clk/sysmodule/src/governor.hpp
+++ b/Source/hoc-clk/sysmodule/src/mgr/governor.hpp
@@ -17,15 +17,15 @@
 
 #include <switch.h>
 #include <hocclk.h>
-#include "board/board.hpp"
+#include "../board/board.hpp"
 #include "clock_manager.hpp"
 #include <cstring>
-#include "file_utils.hpp"
-#include "board/board.hpp"
-#include "errors.hpp"
-#include "config.hpp"
-#include "integrations.hpp"
-#include <nxExt/cpp/lockable_mutex.h>
+#include "../file/file_utils.hpp"
+#include "../board/board.hpp"
+#include "../file/errors.hpp"
+#include "../file/config.hpp"
+#include "../hos/integrations.hpp"
+#include "../util/lockable_mutex.h"
 
 namespace governor {
     extern bool isCpuGovernorInBoostMode;
diff --git a/Source/hoc-clk/common/src/battery.cpp b/Source/hoc-clk/sysmodule/src/pwr/battery.cpp
similarity index 100%
rename from Source/hoc-clk/common/src/battery.cpp
rename to Source/hoc-clk/sysmodule/src/pwr/battery.cpp
diff --git a/Source/hoc-clk/common/include/battery.h b/Source/hoc-clk/sysmodule/src/pwr/battery.h
similarity index 100%
rename from Source/hoc-clk/common/include/battery.h
rename to Source/hoc-clk/sysmodule/src/pwr/battery.h
diff --git a/Source/hoc-clk/common/include/fuse.h b/Source/hoc-clk/sysmodule/src/soc/fuse.h
similarity index 100%
rename from Source/hoc-clk/common/include/fuse.h
rename to Source/hoc-clk/sysmodule/src/soc/fuse.h
diff --git a/Source/hoc-clk/sysmodule/src/board/pllmb.cpp b/Source/hoc-clk/sysmodule/src/soc/pllmb.cpp
similarity index 100%
rename from Source/hoc-clk/sysmodule/src/board/pllmb.cpp
rename to Source/hoc-clk/sysmodule/src/soc/pllmb.cpp
diff --git a/Source/hoc-clk/sysmodule/src/board/pllmb.hpp b/Source/hoc-clk/sysmodule/src/soc/pllmb.hpp
similarity index 96%
rename from Source/hoc-clk/sysmodule/src/board/pllmb.hpp
rename to Source/hoc-clk/sysmodule/src/soc/pllmb.hpp
index b2c85639..a6aa78f7 100644
--- a/Source/hoc-clk/sysmodule/src/board/pllmb.hpp
+++ b/Source/hoc-clk/sysmodule/src/soc/pllmb.hpp
@@ -21,7 +21,7 @@
 #include <cstdint>
 #include <switch.h>
 #include <hocclk.h>
-#include "board.hpp"  
+#include "../board/board.hpp"
 #include <registers.h>
 namespace pllmb {
 
diff --git a/Source/hoc-clk/common/include/registers.h b/Source/hoc-clk/sysmodule/src/soc/registers.h
similarity index 100%
rename from Source/hoc-clk/common/include/registers.h
rename to Source/hoc-clk/sysmodule/src/soc/registers.h
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/src/t210.c b/Source/hoc-clk/sysmodule/src/soc/t210.c
similarity index 99%
rename from Source/hoc-clk/sysmodule/lib/nxExt/src/t210.c
rename to Source/hoc-clk/sysmodule/src/soc/t210.c
index e4101083..dd92fb19 100644
--- a/Source/hoc-clk/sysmodule/lib/nxExt/src/t210.c
+++ b/Source/hoc-clk/sysmodule/src/soc/t210.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nxExt/t210.h"
+#include "t210.h"
 
 #define WAIT_NS 1000000000UL
 
@@ -236,7 +236,7 @@ static void _clock_update_freqs(void)
     {
         return;
     }
-
+    
     const u32 osc = 38400000;
     u32 coeff = GPU_TRIM_SYS_GPCPLL(GPU_TRIM_SYS_GPCPLL_COEFF);
     u32 divm = coeff & 0xFF;
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/t210.h b/Source/hoc-clk/sysmodule/src/soc/t210.h
similarity index 100%
rename from Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/t210.h
rename to Source/hoc-clk/sysmodule/src/soc/t210.h
diff --git a/Source/hoc-clk/sysmodule/src/tsensor/aotag.cpp b/Source/hoc-clk/sysmodule/src/tsensor/aotag.cpp
index 03f7ead8..460ac88f 100644
--- a/Source/hoc-clk/sysmodule/src/tsensor/aotag.cpp
+++ b/Source/hoc-clk/sysmodule/src/tsensor/aotag.cpp
@@ -21,8 +21,8 @@
  */
 
 #include <notification.h>
-#include "../mem_map.hpp"
-#include "../file_utils.hpp"
+#include "../mapping/mem_map.hpp"
+#include "../file/file_utils.hpp"
 #include "tsensor_common.hpp"
 #include "aotag.hpp"
 
diff --git a/Source/hoc-clk/sysmodule/src/tsensor/bq24193.hpp b/Source/hoc-clk/sysmodule/src/tsensor/bq24193.hpp
index aae7ca26..e10b3ff1 100644
--- a/Source/hoc-clk/sysmodule/src/tsensor/bq24193.hpp
+++ b/Source/hoc-clk/sysmodule/src/tsensor/bq24193.hpp
@@ -19,6 +19,7 @@
 
 #include "../board/board.hpp"
 #include <i2c.h>
+#include "../i2c/i2cDrv.h"
 
 namespace bq24193 {
     #define BQ24193_I2C_ADDR 0x6B
diff --git a/Source/hoc-clk/sysmodule/src/tsensor/soctherm.cpp b/Source/hoc-clk/sysmodule/src/tsensor/soctherm.cpp
index 04c5dfbb..4fcb8ff2 100644
--- a/Source/hoc-clk/sysmodule/src/tsensor/soctherm.cpp
+++ b/Source/hoc-clk/sysmodule/src/tsensor/soctherm.cpp
@@ -23,8 +23,8 @@
 #include <switch.h>
 #include <hocclk.h>
 #include "../board/board.hpp"
-#include "../file_utils.hpp"
-#include "../mem_map.hpp"
+#include "../file/file_utils.hpp"
+#include "../mapping/mem_map.hpp"
 #include "soctherm.hpp"
 #include "tsensor_common.hpp"
 
diff --git a/Source/hoc-clk/common/src/crc32.cpp b/Source/hoc-clk/sysmodule/src/util/crc32.cpp
similarity index 100%
rename from Source/hoc-clk/common/src/crc32.cpp
rename to Source/hoc-clk/sysmodule/src/util/crc32.cpp
diff --git a/Source/hoc-clk/common/include/crc32.h b/Source/hoc-clk/sysmodule/src/util/crc32.h
similarity index 100%
rename from Source/hoc-clk/common/include/crc32.h
rename to Source/hoc-clk/sysmodule/src/util/crc32.h
diff --git a/Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/cpp/lockable_mutex.h b/Source/hoc-clk/sysmodule/src/util/lockable_mutex.h
similarity index 100%
rename from Source/hoc-clk/sysmodule/lib/nxExt/include/nxExt/cpp/lockable_mutex.h
rename to Source/hoc-clk/sysmodule/src/util/lockable_mutex.h
diff --git a/Source/hoc-clk/common/src/memmem.c b/Source/hoc-clk/sysmodule/src/util/memmem.c
similarity index 100%
rename from Source/hoc-clk/common/src/memmem.c
rename to Source/hoc-clk/sysmodule/src/util/memmem.c
diff --git a/Source/hoc-clk/common/include/memmem.h b/Source/hoc-clk/sysmodule/src/util/memmem.h
similarity index 100%
rename from Source/hoc-clk/common/include/memmem.h
rename to Source/hoc-clk/sysmodule/src/util/memmem.h
diff --git a/Source/hoc-clk/common/include/service_guard.h b/Source/hoc-clk/sysmodule/src/util/service_guard.h
similarity index 100%
rename from Source/hoc-clk/common/include/service_guard.h
rename to Source/hoc-clk/sysmodule/src/util/service_guard.h