diff --git a/binding.gyp b/binding.gyp
index 43cceec..ff5c633 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -4,35 +4,35 @@
 			"target_name": "syscall",
 			'cflags': [ '-Wall' ],
 			"sources": [
-				"clibs/chibrax/syscall.cc"
+				"clibs/syscall.cc"
 			]
 		},
 		{
 			"target_name": "ioctl",
 			'cflags': [ '-Wall' ],
 			"sources": [
-				"clibs/chibrax/ioctl.cc"
+				"clibs/ioctl.cc"
 			]
 		},
 		{
 			"target_name": "mount",
 			'cflags': [ '-Wall' ],
 			"sources": [
-				"clibs/chibrax/mount.cc"
+				"clibs/mount.cc"
 			]
 		},
 		{
 			"target_name": "socket",
 			'cflags': [ '-Wall' ],
 			"sources": [
-				"clibs/chibrax/socket.cc"
+				"clibs/socket.cc"
 			]
 		},
 		{
 			"target_name": "ip",
 			'cflags': [ '-Wall', '-Wextra' ],
 			"sources": [
-				"clibs/chibrax/ip.cc"
+				"clibs/ip.cc"
 			]
 		}
 	]
diff --git a/clibs/chibrax/ioctl.cc b/clibs/ioctl.cc
similarity index 100%
rename from clibs/chibrax/ioctl.cc
rename to clibs/ioctl.cc
diff --git a/clibs/chibrax/ip.cc b/clibs/ip.cc
similarity index 100%
rename from clibs/chibrax/ip.cc
rename to clibs/ip.cc
diff --git a/clibs/chibrax/mount.cc b/clibs/mount.cc
similarity index 100%
rename from clibs/chibrax/mount.cc
rename to clibs/mount.cc
diff --git a/clibs/chibrax/nodeparams.hpp b/clibs/nodeparams.hpp
similarity index 100%
rename from clibs/chibrax/nodeparams.hpp
rename to clibs/nodeparams.hpp
diff --git a/clibs/chibrax/socket.cc b/clibs/socket.cc
similarity index 100%
rename from clibs/chibrax/socket.cc
rename to clibs/socket.cc
diff --git a/clibs/chibrax/syscall.cc b/clibs/syscall.cc
similarity index 100%
rename from clibs/chibrax/syscall.cc
rename to clibs/syscall.cc
diff --git a/chibraxLoader/.gitignore b/osLoader/.gitignore
similarity index 100%
rename from chibraxLoader/.gitignore
rename to osLoader/.gitignore
diff --git a/chibraxLoader/build.sh b/osLoader/build.sh
similarity index 72%
rename from chibraxLoader/build.sh
rename to osLoader/build.sh
index 792f5cb..a2595c6 100755
--- a/chibraxLoader/build.sh
+++ b/osLoader/build.sh
@@ -4,4 +4,4 @@ then echo "Please don't run this as root"
     exit
 fi
 
-gcc chibraxLoader.c -O3 -o init
+gcc osLoader.c -O3 -o init
diff --git a/chibraxLoader/chibraxLoader.c b/osLoader/osLoader.c
similarity index 84%
rename from chibraxLoader/chibraxLoader.c
rename to osLoader/osLoader.c
index f418c6d..58cad01 100644
--- a/chibraxLoader/chibraxLoader.c
+++ b/osLoader/osLoader.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 //Chemin exacte de node (a changer aprés la creation d'un gestionnaire de packets)
 #define node "/usr/local/bin/node"
-#define chibrax "/chibrax/index.js"
+#define chibrax "/core/index.js"
 
 int main() {
 	execl(node, node, chibrax);
diff --git a/rootfs overrides/boot/grub/grub.cfg b/rootfs overrides/boot/grub/grub.cfg
index 02c77f0..3b1bcfa 100644
--- a/rootfs overrides/boot/grub/grub.cfg	
+++ b/rootfs overrides/boot/grub/grub.cfg	
@@ -1,10 +1,3 @@
-#
-# DO NOT EDIT THIS FILE
-#
-# It is automatically generated by grub-mkconfig using templates
-# from /etc/grub.d and settings from /etc/default/grub
-#
-
 ### BEGIN /etc/grub.d/00_header ###
 insmod part_gpt
 insmod part_msdos
diff --git a/rootfs overrides/chibrax/.gitignore b/rootfs overrides/core/.gitignore
similarity index 100%
rename from rootfs overrides/chibrax/.gitignore
rename to rootfs overrides/core/.gitignore
diff --git a/rootfs overrides/chibrax/audio.js b/rootfs overrides/core/audio.js
similarity index 100%
rename from rootfs overrides/chibrax/audio.js
rename to rootfs overrides/core/audio.js
diff --git a/rootfs overrides/chibrax/errno.js b/rootfs overrides/core/errno.js
similarity index 100%
rename from rootfs overrides/chibrax/errno.js
rename to rootfs overrides/core/errno.js
diff --git a/rootfs overrides/chibrax/graphics.js b/rootfs overrides/core/graphics.js
similarity index 100%
rename from rootfs overrides/chibrax/graphics.js
rename to rootfs overrides/core/graphics.js
diff --git a/rootfs overrides/chibrax/hook.js b/rootfs overrides/core/hook.js
similarity index 100%
rename from rootfs overrides/chibrax/hook.js
rename to rootfs overrides/core/hook.js
diff --git a/rootfs overrides/chibrax/index.js b/rootfs overrides/core/index.js
similarity index 100%
rename from rootfs overrides/chibrax/index.js
rename to rootfs overrides/core/index.js
diff --git a/rootfs overrides/chibrax/initd.js b/rootfs overrides/core/initd.js
similarity index 100%
rename from rootfs overrides/chibrax/initd.js
rename to rootfs overrides/core/initd.js
diff --git a/rootfs overrides/chibrax/input.js b/rootfs overrides/core/input.js
similarity index 100%
rename from rootfs overrides/chibrax/input.js
rename to rootfs overrides/core/input.js
diff --git a/rootfs overrides/chibrax/ioctl.js b/rootfs overrides/core/ioctl.js
similarity index 100%
rename from rootfs overrides/chibrax/ioctl.js
rename to rootfs overrides/core/ioctl.js
diff --git a/rootfs overrides/chibrax/ip.js b/rootfs overrides/core/ip.js
similarity index 100%
rename from rootfs overrides/chibrax/ip.js
rename to rootfs overrides/core/ip.js
diff --git a/rootfs overrides/chibrax/ip.node b/rootfs overrides/core/ip.node
similarity index 100%
rename from rootfs overrides/chibrax/ip.node
rename to rootfs overrides/core/ip.node
diff --git a/rootfs overrides/chibrax/kernel.js b/rootfs overrides/core/kernel.js
similarity index 100%
rename from rootfs overrides/chibrax/kernel.js
rename to rootfs overrides/core/kernel.js
diff --git a/rootfs overrides/chibrax/mount.js b/rootfs overrides/core/mount.js
similarity index 100%
rename from rootfs overrides/chibrax/mount.js
rename to rootfs overrides/core/mount.js
diff --git a/rootfs overrides/chibrax/package.json b/rootfs overrides/core/package.json
similarity index 100%
rename from rootfs overrides/chibrax/package.json
rename to rootfs overrides/core/package.json
diff --git a/rootfs overrides/chibrax/reboot.js b/rootfs overrides/core/reboot.js
similarity index 100%
rename from rootfs overrides/chibrax/reboot.js
rename to rootfs overrides/core/reboot.js
diff --git a/rootfs overrides/chibrax/sheeebr.wav b/rootfs overrides/core/sheeebr.wav
similarity index 100%
rename from rootfs overrides/chibrax/sheeebr.wav
rename to rootfs overrides/core/sheeebr.wav
diff --git a/rootfs overrides/chibrax/sleep.js b/rootfs overrides/core/sleep.js
similarity index 100%
rename from rootfs overrides/chibrax/sleep.js
rename to rootfs overrides/core/sleep.js
diff --git a/rootfs overrides/chibrax/socket.node b/rootfs overrides/core/socket.node
similarity index 100%
rename from rootfs overrides/chibrax/socket.node
rename to rootfs overrides/core/socket.node
diff --git a/rootfs overrides/chibrax/sockets.js b/rootfs overrides/core/sockets.js
similarity index 100%
rename from rootfs overrides/chibrax/sockets.js
rename to rootfs overrides/core/sockets.js
diff --git a/rootfs overrides/chibrax/suportedFilesystems.js b/rootfs overrides/core/suportedFilesystems.js
similarity index 100%
rename from rootfs overrides/chibrax/suportedFilesystems.js
rename to rootfs overrides/core/suportedFilesystems.js
diff --git a/rootfs overrides/etc/init.d/filesystem.js b/rootfs overrides/etc/init.d/filesystem.js
index 656520c..946ef71 100644
--- a/rootfs overrides/etc/init.d/filesystem.js	
+++ b/rootfs overrides/etc/init.d/filesystem.js	
@@ -1,5 +1,5 @@
 //@ts-check
-const { cmount, mount, flags } = require('../../chibrax/mount.js')
+const { cmount, mount, flags } = require('../../core/mount.js')
 
 async function init() {
     cmount("dummy", "/proc", "proc",
diff --git a/rootfs overrides/etc/init.d/lo.js b/rootfs overrides/etc/init.d/lo.js
index 09cb92e..2a7aca4 100644
--- a/rootfs overrides/etc/init.d/lo.js	
+++ b/rootfs overrides/etc/init.d/lo.js	
@@ -1,4 +1,4 @@
-const ip = require('../../chibrax/ip')
+const ip = require('../../core/ip')
 //async is optional but recomended for optimisation (optimisations are yet to be implemented)
 async function init() {
     ip.setFlags('lo', ip.flags.IFF_UP | ip.flags.IFF_LOOPBACK | ip.flags.IFF_RUNNING)
diff --git a/rootfs overrides/etc/init.d/startupSound.js b/rootfs overrides/etc/init.d/startupSound.js
index bdb5892..e3af8bd 100644
--- a/rootfs overrides/etc/init.d/startupSound.js	
+++ b/rootfs overrides/etc/init.d/startupSound.js	
@@ -1,4 +1,4 @@
-const audio = require('/chibrax/audio.js')
+const audio = require('../../core/audio')
 
 async function init() {
     audio('/chibrax/sheeebr.wav')
diff --git a/rootfs overrides/usr/bin/framebuffer-demo.js b/rootfs overrides/usr/bin/framebuffer-demo.js
index 3e60be1..1ea53e2 100644
--- a/rootfs overrides/usr/bin/framebuffer-demo.js	
+++ b/rootfs overrides/usr/bin/framebuffer-demo.js	
@@ -1,5 +1,5 @@
 //@ts-check
-const graphics = require('../../chibrax/graphics')
+const graphics = require('../../core/graphics')
 const shapes = require('../lib/shapes')
 const path = require('path')
 
diff --git a/rootfs overrides/usr/bin/modprobe.js b/rootfs overrides/usr/bin/modprobe.js
index f135689..c4bc705 100644
--- a/rootfs overrides/usr/bin/modprobe.js	
+++ b/rootfs overrides/usr/bin/modprobe.js	
@@ -1,5 +1,5 @@
 //@ts-check
-const { finit_module, uname } = require('../../chibrax/kernel.js')
+const { finit_module, uname } = require('../../core/kernel.js')
 const fs = require('fs')
 const path = require('path')
 
diff --git a/rootfs overrides/usr/lib/shapes.js b/rootfs overrides/usr/lib/shapes.js
index 9591f1b..25128fd 100644
--- a/rootfs overrides/usr/lib/shapes.js	
+++ b/rootfs overrides/usr/lib/shapes.js	
@@ -3,7 +3,7 @@
  * DICKPICK is a image drawing library
  */
 
-const graphics = require('../../chibrax/graphics')
+const graphics = require('../../core/graphics')
 
 /**
  * @param { number } x