diff --git a/src/Library/include/BootLoader/boot_loader.hpp b/src/Library/internal-include/BootLoader/boot_loader.hpp
similarity index 100%
rename from src/Library/include/BootLoader/boot_loader.hpp
rename to src/Library/internal-include/BootLoader/boot_loader.hpp
diff --git a/src/Library/include/CD/cd_internal.hpp b/src/Library/internal-include/CD/cd_internal.hpp
similarity index 100%
rename from src/Library/include/CD/cd_internal.hpp
rename to src/Library/internal-include/CD/cd_internal.hpp
diff --git a/src/Library/include/CD/cd_types.hpp b/src/Library/internal-include/CD/cd_types.hpp
similarity index 100%
rename from src/Library/include/CD/cd_types.hpp
rename to src/Library/internal-include/CD/cd_types.hpp
diff --git a/src/Library/include/GPU/gpu_internal.hpp b/src/Library/internal-include/GPU/gpu_internal.hpp
similarity index 100%
rename from src/Library/include/GPU/gpu_internal.hpp
rename to src/Library/internal-include/GPU/gpu_internal.hpp
diff --git a/src/Library/src/BootLoader/boot_file/main_boot.cpp b/src/Library/src/BootLoader/boot_file/main_boot.cpp
index afd053a1..711ead13 100644
--- a/src/Library/src/BootLoader/boot_file/main_boot.cpp
+++ b/src/Library/src/BootLoader/boot_file/main_boot.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/BootLoader/boot_loader.hpp"
+#include "../../../internal-include/BootLoader/boot_loader.hpp"
 #include <stdio.h>
 
 #include <PSX/File/Processor/cd_file_processor.hpp>
diff --git a/src/Library/src/BootLoader/boot_file/overlay_boot.cpp b/src/Library/src/BootLoader/boot_file/overlay_boot.cpp
index 0bd5e969..decd2942 100644
--- a/src/Library/src/BootLoader/boot_file/overlay_boot.cpp
+++ b/src/Library/src/BootLoader/boot_file/overlay_boot.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/BootLoader/boot_loader.hpp"
+#include "../../../internal-include/BootLoader/boot_loader.hpp"
 #include <stdio.h>
 
 namespace JabyEngine {
diff --git a/src/Library/src/BootLoader/cd_boot.cpp b/src/Library/src/BootLoader/cd_boot.cpp
index e52d6ded..37016a89 100644
--- a/src/Library/src/BootLoader/cd_boot.cpp
+++ b/src/Library/src/BootLoader/cd_boot.cpp
@@ -1,5 +1,5 @@
-#include "../../include/BootLoader/boot_loader.hpp"
-#include "../../include/CD/cd_internal.hpp"
+#include "../../internal-include/BootLoader/boot_loader.hpp"
+#include "../../internal-include/CD/cd_internal.hpp"
 #include <PSX/System/IOPorts/interrupt_io.hpp>
 #include <PSX/System/IOPorts/memory_io.hpp>
 #include <PSX/System/syscalls.h>
diff --git a/src/Library/src/BootLoader/gpu_boot.cpp b/src/Library/src/BootLoader/gpu_boot.cpp
index c682a2b6..fa0d97bd 100644
--- a/src/Library/src/BootLoader/gpu_boot.cpp
+++ b/src/Library/src/BootLoader/gpu_boot.cpp
@@ -1,4 +1,4 @@
-#include "../../include/GPU/gpu_internal.hpp"
+#include "../../internal-include/GPU/gpu_internal.hpp"
 #include <PSX/File/Processor/file_processor.hpp>
 #include <PSX/Auxiliary/lz4_decompressor.hpp>
 #include <PSX/GPU/gpu.hpp>
diff --git a/src/Library/src/BootLoader/start_boot.cpp b/src/Library/src/BootLoader/start_boot.cpp
index 1745006c..94cc51ee 100644
--- a/src/Library/src/BootLoader/start_boot.cpp
+++ b/src/Library/src/BootLoader/start_boot.cpp
@@ -1,4 +1,4 @@
-#include "BootLoader/boot_loader.hpp"
+#include "../../internal-include/BootLoader/boot_loader.hpp"
 #include <PSX/System/IOPorts/dMa_io.hpp>
 
 // 2x For setup timing
diff --git a/src/Library/src/CD/cd.cpp b/src/Library/src/CD/cd.cpp
index 6edba049..f64c7edf 100644
--- a/src/Library/src/CD/cd.cpp
+++ b/src/Library/src/CD/cd.cpp
@@ -1,4 +1,4 @@
-#include "../../include/CD/cd_internal.hpp"
+#include "../../internal-include/CD/cd_internal.hpp"
 #include <PSX/System/IOPorts/interrupt_io.hpp>
 #include <PSX/System/syscalls.h>
 
diff --git a/src/Library/src/File/Processor/cd_file_processor.cpp b/src/Library/src/File/Processor/cd_file_processor.cpp
index 41c79ecd..58a9dd52 100644
--- a/src/Library/src/File/Processor/cd_file_processor.cpp
+++ b/src/Library/src/File/Processor/cd_file_processor.cpp
@@ -1,5 +1,5 @@
+#include "../../../internal-include/CD/cd_internal.hpp"
 #include <PSX/File/Processor/cd_file_processor.hpp>
-#include <CD/cd_internal.hpp>
 #include <stdio.h>
 
 namespace JabyEngine {
diff --git a/src/Library/src/File/Processor/tim_processor.cpp b/src/Library/src/File/Processor/tim_processor.cpp
index 636a00eb..c9a3eca8 100644
--- a/src/Library/src/File/Processor/tim_processor.cpp
+++ b/src/Library/src/File/Processor/tim_processor.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/GPU/gpu_internal.hpp"
+#include "../../../internal-include/GPU/gpu_internal.hpp"
 #include "simplehelper.hpp"
 #include <limits.h>
 #include <stdio.h>
diff --git a/src/Library/src/GPU/gpu.cpp b/src/Library/src/GPU/gpu.cpp
index de902fd1..b4004e80 100644
--- a/src/Library/src/GPU/gpu.cpp
+++ b/src/Library/src/GPU/gpu.cpp
@@ -1,4 +1,4 @@
-#include "../include/GPU/gpu_internal.hpp"
+#include "../../internal-include/GPU/gpu_internal.hpp"
 
 namespace JabyEngine {
     namespace GPU {
diff --git a/src/Library/src/startup.cpp b/src/Library/src/startup.cpp
index b99bcf79..78c2ede0 100644
--- a/src/Library/src/startup.cpp
+++ b/src/Library/src/startup.cpp
@@ -1,4 +1,4 @@
-#include "../include/BootLoader/boot_loader.hpp"
+#include "../internal-include/BootLoader/boot_loader.hpp"
 #include <stdio.h>
 
 namespace JabyEngine {
@@ -10,7 +10,7 @@ namespace JabyEngine {
     void start() {
         NextRoutine next_routine = JabyEngine::NextRoutine::from(boot::Start::setup);
 
-        printf("Starting Planschbecken Version 0 0x%p\n", next_routine.value);
+        printf("Starting Planschbecken 0x%p\n", next_routine.value);
         while(true) {
             if(next_routine.is_null()) {
                 break;