diff --git a/makefile b/makefile
index d0ee47d4f..fae5c1fbe 100644
--- a/makefile
+++ b/makefile
@@ -5,8 +5,8 @@ SUBDIRS = src
 include makefile.inc
 
 kernel.bin: $(SUBDIRS)
-	@$(GCC) -T $(OS_CPP)/linker.ld -o $(BUILD_TO) -ffreestanding -O2 -fno-rtti -fno-exceptions -nostartfiles -nostdlib $(OBJ_DIR)/*.o -lgcc 
+	@$(GCC) -T $(OS_CPP)/linker.ld -o $(BUILD_TO) -ffreestanding -O2 -fno-rtti -fno-exceptions -nostartfiles -nostdlib $(OBJ_DIR)/*.o -lgcc
 	@sync
 
 clean:
-	rm $(OBJ_DIR)/*.o
\ No newline at end of file
+	rm $(OBJ_DIR)/*.o
diff --git a/makefile.inc b/makefile.inc
index 425c9712a..984f162ec 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -1,9 +1,9 @@
 AS = i686-elf-as
 GPP = i686-elf-g++
 GCC = i686-elf-gcc
-OS_CPP = /media/sdcard/ExOS
-BUILD_TO = /mnt/boot/kernel.bin
-CFLAGS = -c -ffreestanding -O2 -Wall -Wextra -fno-rtti -fno-exceptions -std=gnu++14
+OS_CPP = /home/garrett/workspace/ExOS
+BUILD_TO = /run/media/garrett/EXOS/boot/kernel.bin
+CFLAGS = -c -ffreestanding -O2 -Wall -Wextra -fno-rtti -fno-exceptions -std=gnu++14 -I$(OS_CPP)/src
 OBJ_DIR = $(OS_CPP)/build
 
 %.o: %.c
diff --git a/src/global.h b/src/Global.h
similarity index 100%
rename from src/global.h
rename to src/Global.h
diff --git a/src/boot/boot.s b/src/boot/Boot.s
similarity index 100%
rename from src/boot/boot.s
rename to src/boot/Boot.s
diff --git a/src/clib_misc/Abort.c b/src/clib_misc/Abort.c
index e92a47ff7..9da693f30 100644
--- a/src/clib_misc/Abort.c
+++ b/src/clib_misc/Abort.c
@@ -5,8 +5,8 @@
  *  Created on: Aug 14, 2017
  *      Author: garrett
  */
-#include "abort.h"
-#include "../drivers/TTY/Console.h"
+#include "clib_misc/Abort.h"
+#include "drivers/TTY/Console.h"
 
 extern "C"
 void /*__cxxabiv1::*/__cxa_pure_virtual(void) {
diff --git a/src/clib_misc/Abort.h b/src/clib_misc/Abort.h
index 0f8d1cf66..3d04a2390 100644
--- a/src/clib_misc/Abort.h
+++ b/src/clib_misc/Abort.h
@@ -8,7 +8,7 @@
 #ifndef SRC_CLIBMISC_ABORT_H_
 #define SRC_CLIBMISC_ABORT_H_
 
-#include "../global.h"
+#include "Global.h"
 
 #if defined(__cplusplus)
 extern "C" {/* Use C linkage for kernel_main. */
diff --git a/src/drivers/Keyboard.cpp b/src/drivers/Keyboard.cpp
index 38ec07d5c..2efa76a38 100644
--- a/src/drivers/Keyboard.cpp
+++ b/src/drivers/Keyboard.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "Keyboard.h"
+#include "drivers/Keyboard.h"
 
 Keyboard::Keyboard( ) {
 
diff --git a/src/drivers/Keyboard.h b/src/drivers/Keyboard.h
index e5f740e07..755108683 100644
--- a/src/drivers/Keyboard.h
+++ b/src/drivers/Keyboard.h
@@ -8,7 +8,7 @@
 #ifndef KEYBOARD_H_
 #define KEYBOARD_H_
 
-#include "../Global.h"
+#include "Global.h"
 /**
  * the possible scan code sets
  */
diff --git a/src/drivers/PCI/PCI.c b/src/drivers/PCI/PCI.c
index 9fd36c6c7..42b060534 100644
--- a/src/drivers/PCI/PCI.c
+++ b/src/drivers/PCI/PCI.c
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "PCI.h"
+#include "drivers/PCI/PCI.h"
 
 //TODO clean up a lot
 
diff --git a/src/drivers/PCI/PCI.h b/src/drivers/PCI/PCI.h
index 865aad3d1..b779a352b 100644
--- a/src/drivers/PCI/PCI.h
+++ b/src/drivers/PCI/PCI.h
@@ -8,7 +8,7 @@
 #ifndef SRC_DRIVERS_PCI_PCI_H_
 #define SRC_DRIVERS_PCI_PCI_H_
 
-#include "../../Global.h"
+#include "Global.h"
 
 extern int8_t MAX_PCI_FUNCTIONS;
 /**
diff --git a/src/drivers/PCI/PCIDeviceList.cpp b/src/drivers/PCI/PCIDeviceList.cpp
index cb4728844..4f343eb04 100644
--- a/src/drivers/PCI/PCIDeviceList.cpp
+++ b/src/drivers/PCI/PCIDeviceList.cpp
@@ -6,12 +6,12 @@
  *      Author: garrett
  */
 
-#include "PCIDeviceList.h"
-#include "PCI.h"
-#include "PCI_devices/PCIStandardDevice.h"
-#include "PCI_devices/PCIBridgeDevice.h"
-#include "PCI_devices/PCICardBusDevice.h"
-#include "../TTY/Console.h"
+#include "drivers/PCI/PCIDeviceList.h"
+#include "drivers/PCI/PCI.h"
+#include "drivers/PCI/PCI_devices/PCIStandardDevice.h"
+#include "drivers/PCI/PCI_devices/PCIBridgeDevice.h"
+#include "drivers/PCI/PCI_devices/PCICardBusDevice.h"
+#include "drivers/TTY/Console.h"
 
 PCIDeviceList::PCIDeviceList( ) {
 	_list = new LinkedList<PCIDevice*>;
diff --git a/src/drivers/PCI/PCIDeviceList.h b/src/drivers/PCI/PCIDeviceList.h
index b3a323b09..a5fc5ad94 100644
--- a/src/drivers/PCI/PCIDeviceList.h
+++ b/src/drivers/PCI/PCIDeviceList.h
@@ -8,8 +8,8 @@
 #ifndef SRC_DRIVERS_PCI_PCIDEVICELIST_H_
 #define SRC_DRIVERS_PCI_PCIDEVICELIST_H_
 
-#include "../../Global.h"
-#include "../../utils/linked_list/LinkedList.h"
+#include "Global.h"
+#include "utils/linked_list/LinkedList.h"
 
 class PCIDevice;
 
diff --git a/src/drivers/PCI/PCI_devices/PCIBridgeDevice.cpp b/src/drivers/PCI/PCI_devices/PCIBridgeDevice.cpp
index 9e8659657..6a5a17e7d 100644
--- a/src/drivers/PCI/PCI_devices/PCIBridgeDevice.cpp
+++ b/src/drivers/PCI/PCI_devices/PCIBridgeDevice.cpp
@@ -4,7 +4,7 @@
  *  Created on: Aug 16, 2017
  *      Author: garrett
  */
-#include "PCIBridgeDevice.h"
+#include "drivers/PCI/PCI_devices/PCIBridgeDevice.h"
 PCIBridgeDevice::PCIBridgeDevice( ) {
 	// TODO Auto-generated constructor stub
 
diff --git a/src/drivers/PCI/PCI_devices/PCIBridgeDevice.h b/src/drivers/PCI/PCI_devices/PCIBridgeDevice.h
index 2c28a2ad5..b43c306c5 100644
--- a/src/drivers/PCI/PCI_devices/PCIBridgeDevice.h
+++ b/src/drivers/PCI/PCI_devices/PCIBridgeDevice.h
@@ -8,8 +8,8 @@
 #ifndef SRC_DRIVERS_PCI_PCIDEVICES_PCIBRIDGEDEVICE_H_
 #define SRC_DRIVERS_PCI_PCIDEVICES_PCIBRIDGEDEVICE_H_
 
-#include "PCIDevice.h"
-#include "../../../Global.h"
+#include "drivers/PCI/PCI_devices/PCIDevice.h"
+#include "Global.h"
 
 class PCIBridgeDevice: public PCIDevice {
 	public:
diff --git a/src/drivers/PCI/PCI_devices/PCICardBusDevice.cpp b/src/drivers/PCI/PCI_devices/PCICardBusDevice.cpp
index 36eaf8895..550836605 100644
--- a/src/drivers/PCI/PCI_devices/PCICardBusDevice.cpp
+++ b/src/drivers/PCI/PCI_devices/PCICardBusDevice.cpp
@@ -4,7 +4,7 @@
  *  Created on: Aug 16, 2017
  *      Author: garrett
  */
-#include "PCICardBusDevice.h"
+#include "drivers/PCI/PCI_devices/PCICardBusDevice.h"
 PCICardBusDevice::PCICardBusDevice( ) {
 	// TODO Auto-generated constructor stub
 
diff --git a/src/drivers/PCI/PCI_devices/PCICardBusDevice.h b/src/drivers/PCI/PCI_devices/PCICardBusDevice.h
index 46ba3cf7e..8ebe4f608 100644
--- a/src/drivers/PCI/PCI_devices/PCICardBusDevice.h
+++ b/src/drivers/PCI/PCI_devices/PCICardBusDevice.h
@@ -8,8 +8,8 @@
 #ifndef SRC_DRIVERS_PCI_PCIDEVICES_PCICARDBUSDEVICE_H_
 #define SRC_DRIVERS_PCI_PCIDEVICES_PCICARDBUSDEVICE_H_
 
-#include "PCIDevice.h"
-#include "../../../Global.h"
+#include "drivers/PCI/PCI_devices/PCIDevice.h"
+#include "Global.h"
 
 class PCICardBusDevice: public PCIDevice {
 	public:
diff --git a/src/drivers/PCI/PCI_devices/PCIDevice.cpp b/src/drivers/PCI/PCI_devices/PCIDevice.cpp
index 00ea4e848..9aec5d883 100644
--- a/src/drivers/PCI/PCI_devices/PCIDevice.cpp
+++ b/src/drivers/PCI/PCI_devices/PCIDevice.cpp
@@ -5,8 +5,8 @@
  *      Author: garrett
  */
 
-#include "PCIDevice.h"
-#include "../PCI.h"
+#include "drivers/PCI/PCI_devices/PCIDevice.h"
+#include "drivers/PCI/PCI.h"
 
 PCIDevice::PCIDevice( ) {
 	// TODO Auto-generated constructor stub
diff --git a/src/drivers/PCI/PCI_devices/PCIDevice.h b/src/drivers/PCI/PCI_devices/PCIDevice.h
index 87f048540..56000d426 100644
--- a/src/drivers/PCI/PCI_devices/PCIDevice.h
+++ b/src/drivers/PCI/PCI_devices/PCIDevice.h
@@ -8,7 +8,7 @@
 #ifndef SRC_DRIVERS_PCI_PCIDEVICE_H_
 #define SRC_DRIVERS_PCI_PCIDEVICE_H_
 
-#include "../../../Global.h"
+#include "Global.h"
 
 
 class PCIDevice {
diff --git a/src/drivers/PCI/PCI_devices/PCIStandardDevice.cpp b/src/drivers/PCI/PCI_devices/PCIStandardDevice.cpp
index 2770dd9cc..10b9e0b4c 100644
--- a/src/drivers/PCI/PCI_devices/PCIStandardDevice.cpp
+++ b/src/drivers/PCI/PCI_devices/PCIStandardDevice.cpp
@@ -5,8 +5,8 @@
  *      Author: garrett
  */
 
-#include "PCIStandardDevice.h"
-#include "../PCI.h"
+#include "drivers/PCI/PCI_devices/PCIStandardDevice.h"
+#include "drivers/PCI/PCI.h"
 
 PCIStandardDevice::PCIStandardDevice( ) :
 		PCIDevice( ) {
diff --git a/src/drivers/PCI/PCI_devices/PCIStandardDevice.h b/src/drivers/PCI/PCI_devices/PCIStandardDevice.h
index 1a9910ff0..13339ec39 100644
--- a/src/drivers/PCI/PCI_devices/PCIStandardDevice.h
+++ b/src/drivers/PCI/PCI_devices/PCIStandardDevice.h
@@ -8,8 +8,8 @@
 #ifndef PCISTANDARDDEVICE_H_
 #define PCISTANDARDDEVICE_H_
 
-#include "../../../global.h"
-#include "PCIDevice.h"
+#include "Global.h"
+#include "drivers/PCI/PCI_devices/PCIDevice.h"
 
 
 //class PCIDevice;
diff --git a/src/drivers/PCI/USB/USB.c b/src/drivers/PCI/USB/USB.c
index 7acfd6a39..e9cb4b5d2 100644
--- a/src/drivers/PCI/USB/USB.c
+++ b/src/drivers/PCI/USB/USB.c
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "USB.h"
+#include "drivers/PCI/USB/USB.h"
 
 uint8_t maxUSBVersion = 0;
 USBController* uSBControllers;
diff --git a/src/drivers/PCI/USB/USB.h b/src/drivers/PCI/USB/USB.h
index 4a8ca016b..78786cc50 100644
--- a/src/drivers/PCI/USB/USB.h
+++ b/src/drivers/PCI/USB/USB.h
@@ -8,7 +8,7 @@
 #ifndef SRC_DRIVERS_PCI_USB_USB_H_
 #define SRC_DRIVERS_PCI_USB_USB_H_
 
-#include "../../../Global.h"
+#include "Global.h"
 class USBController;
 
 extern uint8_t maxUSBVersion;
diff --git a/src/drivers/PCI/USB/USBController.cpp b/src/drivers/PCI/USB/USBController.cpp
index 1c4c9d97b..9f0c55fa1 100644
--- a/src/drivers/PCI/USB/USBController.cpp
+++ b/src/drivers/PCI/USB/USBController.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "USBController.h"
+#include "drivers/PCI/USB/USBController.h"
 
 USBController::USBController( ) {
 	// TODO Auto-generated constructor stub
diff --git a/src/drivers/PCI/USB/USBController.h b/src/drivers/PCI/USB/USBController.h
index 64fbc72be..e0bd6873e 100644
--- a/src/drivers/PCI/USB/USBController.h
+++ b/src/drivers/PCI/USB/USBController.h
@@ -8,7 +8,7 @@
 #ifndef USBCONTROLLER_H_
 #define USBCONTROLLER_H_
 
-#include "../../../Global.h"
+#include "Global.h"
 
 class USBController {
 	public:
diff --git a/src/drivers/ProgrammableInterruptController.cpp b/src/drivers/ProgrammableInterruptController.cpp
index f6efa470b..a5ef83f81 100755
--- a/src/drivers/ProgrammableInterruptController.cpp
+++ b/src/drivers/ProgrammableInterruptController.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "ProgrammableInterruptController.h"
+#include "drivers/ProgrammableInterruptController.h"
 
 //TODO comment
 
diff --git a/src/drivers/ProgrammableInterruptController.h b/src/drivers/ProgrammableInterruptController.h
index 60732383b..f21b915ee 100755
--- a/src/drivers/ProgrammableInterruptController.h
+++ b/src/drivers/ProgrammableInterruptController.h
@@ -8,7 +8,7 @@
 #ifndef PROGRAMMABLEINTERRUPTCONTROLLER_H_
 #define PROGRAMMABLEINTERRUPTCONTROLLER_H_
 
-#include "../Global.h"
+#include "Global.h"
 
 
 /*
diff --git a/src/drivers/TTY/Console.cpp b/src/drivers/TTY/Console.cpp
index 15e7f50a0..ed6809b54 100644
--- a/src/drivers/TTY/Console.cpp
+++ b/src/drivers/TTY/Console.cpp
@@ -6,11 +6,11 @@
  *               Oskari
  */
 
-#include "Console.h"
-#include "../../Kernel.h"
-#include "../Keyboard.h"
-#include "../../memory/structures/PageTable.h"
-#include "../../memory/Mem.h"
+#include "drivers/TTY/Console.h"
+#include "Kernel.h"
+#include "drivers/Keyboard.h"
+#include "memory/structures/PageTable.h"
+#include "memory/Mem.h"
 
 /**
  * Function prototype for the internal use newline()
@@ -293,7 +293,9 @@ void writeIntBase(uint64_t num, uint64_t base) {
 
     /* Skip to the first non null char */
     int pos;
-    for (pos = 0; !out[pos]; pos++);
+    for (pos = 0; !out[pos]; pos++){
+
+    }
 
 	terminalWriteString((const char*)(out + pos));
 }
diff --git a/src/drivers/TTY/Console.h b/src/drivers/TTY/Console.h
index 1281b5883..066a37ec0 100644
--- a/src/drivers/TTY/Console.h
+++ b/src/drivers/TTY/Console.h
@@ -9,7 +9,7 @@
 #ifndef CONSOLE_H_
 #define CONSOLE_H_
 
-#include "../../Global.h"
+#include "Global.h"
 
 /**
  * Dimensions of the VGA console
diff --git a/src/interrupts/InterruptDescriptorTable.cpp b/src/interrupts/InterruptDescriptorTable.cpp
index ae84874eb..fe800bd05 100644
--- a/src/interrupts/InterruptDescriptorTable.cpp
+++ b/src/interrupts/InterruptDescriptorTable.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "InterruptDescriptorTable.h"
+#include "interrupts/InterruptDescriptorTable.h"
 
 //TODO comment what each interrupt is
 InterruptDescriptorTable::InterruptDescriptorTable( ) {
diff --git a/src/interrupts/InterruptDescriptorTable.h b/src/interrupts/InterruptDescriptorTable.h
index 237b0400b..36a42e246 100644
--- a/src/interrupts/InterruptDescriptorTable.h
+++ b/src/interrupts/InterruptDescriptorTable.h
@@ -8,7 +8,7 @@
 #ifndef INTERRUPTDESCRIPTORTABLE_H_
 #define INTERRUPTDESCRIPTORTABLE_H_
 
-#include "../Global.h"
+#include "Global.h"
 
 /**
  * structure used by the cpu to handler interrupts
diff --git a/src/interrupts/InterruptHandler.cpp b/src/interrupts/InterruptHandler.cpp
index f5eb52eed..e7958ece3 100644
--- a/src/interrupts/InterruptHandler.cpp
+++ b/src/interrupts/InterruptHandler.cpp
@@ -5,11 +5,11 @@
  *      Author: garrett
  */
 
-#include "InterruptHandler.h"
-#include "../Kernel.h"
-#include "../drivers/Keyboard.h"
-#include "../drivers/TTY/Console.h"
-#include "../drivers/ProgrammableInterruptController.h"
+#include "interrupts/InterruptHandler.h"
+#include "Kernel.h"
+#include "drivers/Keyboard.h"
+#include "drivers/TTY/Console.h"
+#include "drivers/ProgrammableInterruptController.h"
 #if defined(__cplusplus)
 extern "C" {/* Use C linkage for kernel_main. */
 #endif
diff --git a/src/interrupts/InterruptHandler.h b/src/interrupts/InterruptHandler.h
index a4c5d9cf7..5768021f6 100755
--- a/src/interrupts/InterruptHandler.h
+++ b/src/interrupts/InterruptHandler.h
@@ -8,7 +8,7 @@
 #ifndef INTERRUPTHANDLER_H_
 #define INTERRUPTHANDLER_H_
 
-#include "../Global.h"
+#include "Global.h"
 //#include "../drivers/Keyboard.h"
 
 #endif /* INTERRUPTHANDLER_H_ */
diff --git a/src/memory/Mem.cpp b/src/memory/Mem.cpp
index 56617271b..f80f0f7b4 100644
--- a/src/memory/Mem.cpp
+++ b/src/memory/Mem.cpp
@@ -5,8 +5,8 @@
  *      Author: garrett
  */
 
-#include "Mem.h"
-#include "structures/PageTable.h"
+#include "memory/Mem.h"
+#include "memory/structures/PageTable.h"
 MultibootMemoryMap memMap[256];
 /**
  * read the multiboot mem map
diff --git a/src/memory/Mem.h b/src/memory/Mem.h
index 3c6c64631..a77fd8dc4 100644
--- a/src/memory/Mem.h
+++ b/src/memory/Mem.h
@@ -8,9 +8,9 @@
 #ifndef MEM_H_
 #define MEM_H_
 
-#include "../Global.h"
-#include "../Kernel.h"
-#include "../multiboot_spec/Multiboot.h"
+#include "Global.h"
+#include "Kernel.h"
+#include "multiboot_spec/Multiboot.h"
 
 
 struct MultibootMemoryMap{
diff --git a/src/memory/alloc/Malloc.c b/src/memory/alloc/Malloc.c
index f8e632f0d..8245b397b 100644
--- a/src/memory/alloc/Malloc.c
+++ b/src/memory/alloc/Malloc.c
@@ -5,10 +5,10 @@
  *      Author: garrett
  */
 
-#include "Malloc.h"
-#include "../../Kernel.h"
-#include "../structures/PageTable.h"
-#include "PageFrameAllocator.h"
+#include "memory/alloc/Malloc.h"
+#include "Kernel.h"
+#include "memory/structures/PageTable.h"
+#include "memory/alloc/PageFrameAllocator.h"
 
 /**
  * top of the paged in mem
diff --git a/src/memory/alloc/Malloc.h b/src/memory/alloc/Malloc.h
index a5bdba806..20d2d0ca8 100644
--- a/src/memory/alloc/Malloc.h
+++ b/src/memory/alloc/Malloc.h
@@ -8,7 +8,7 @@
 #ifndef MALLOC_H_
 #define MALLOC_H_
 
-#include "../../Global.h"
+#include "Global.h"
 
 /**
  * top of the paged in mem
diff --git a/src/memory/alloc/New.cpp b/src/memory/alloc/New.cpp
index ff160e1e3..dfc7f7014 100644
--- a/src/memory/alloc/New.cpp
+++ b/src/memory/alloc/New.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "New.h"
+#include "memory/alloc/New.h"
 
 //TODO fix this file
 
diff --git a/src/memory/alloc/New.h b/src/memory/alloc/New.h
index ecc10876f..f776d8689 100644
--- a/src/memory/alloc/New.h
+++ b/src/memory/alloc/New.h
@@ -8,7 +8,7 @@
 #ifndef NEW_H_
 #define NEW_H_
 
-#include "../../Global.h"
+#include "Global.h"
 
 void * operator new(size_t size);
 void operator delete(void * p);
diff --git a/src/memory/alloc/PageFrameAllocator.cpp b/src/memory/alloc/PageFrameAllocator.cpp
index 04d9022d2..9f3e9a5d0 100755
--- a/src/memory/alloc/PageFrameAllocator.cpp
+++ b/src/memory/alloc/PageFrameAllocator.cpp
@@ -4,9 +4,9 @@
  *  Created on: Apr 29, 2017
  *      Author: garrett
  */
-#include "PageFrameAllocator.h"
-#include "../Mem.h"
-#include "../structures/PageTable.h"
+#include "memory/alloc/PageFrameAllocator.h"
+#include "memory/Mem.h"
+#include "memory/structures/PageTable.h"
 
 PageFrameAllocator::PageFrameAllocator( ) {
 	// TODO Auto-generated constructor stub
diff --git a/src/memory/alloc/PageFrameAllocator.h b/src/memory/alloc/PageFrameAllocator.h
index 86e449294..ab5985662 100755
--- a/src/memory/alloc/PageFrameAllocator.h
+++ b/src/memory/alloc/PageFrameAllocator.h
@@ -8,7 +8,7 @@
 #ifndef PAGEFRAMEALLOCATOR_H_
 #define PAGEFRAMEALLOCATOR_H_
 
-#include "../../Global.h"
+#include "Global.h"
 
 //#include "../../kernel.h"
 //#include "../structures/PageTable.h"
diff --git a/src/memory/structures/GlobalDescriptorTable.cpp b/src/memory/structures/GlobalDescriptorTable.cpp
index 35715c66c..03ddec58c 100755
--- a/src/memory/structures/GlobalDescriptorTable.cpp
+++ b/src/memory/structures/GlobalDescriptorTable.cpp
@@ -5,8 +5,8 @@
  *      Author: garrett
  */
 
-#include "GlobalDescriptorTable.h"
-#include "../../drivers/TTY/Console.h"
+#include "memory/structures/GlobalDescriptorTable.h"
+#include "drivers/TTY/Console.h"
 
 //this code nver runs, should be replaced with the stuff in ::build() when we get start files and shit
 GlobalDescriptorTable::GlobalDescriptorTable( ) {
diff --git a/src/memory/structures/GlobalDescriptorTable.h b/src/memory/structures/GlobalDescriptorTable.h
index b0a53242c..8b0760d8b 100755
--- a/src/memory/structures/GlobalDescriptorTable.h
+++ b/src/memory/structures/GlobalDescriptorTable.h
@@ -8,7 +8,7 @@
 #ifndef GLOBALDESCRIPTORTABLE_H_
 #define GLOBALDESCRIPTORTABLE_H_
 //#include "../../drivers/Console.h"
-#include "../../Global.h"
+#include "Global.h"
 
 
 
diff --git a/src/memory/structures/PageTable.cpp b/src/memory/structures/PageTable.cpp
index c974dfe24..e26e92830 100755
--- a/src/memory/structures/PageTable.cpp
+++ b/src/memory/structures/PageTable.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "PageTable.h"
+#include "memory/structures/PageTable.h"
 
 PageTable::PageTable( ) {
 }
diff --git a/src/memory/structures/PageTable.h b/src/memory/structures/PageTable.h
index c27944f38..30415c028 100755
--- a/src/memory/structures/PageTable.h
+++ b/src/memory/structures/PageTable.h
@@ -8,7 +8,7 @@
 #ifndef PAGETABLE_H_
 #define PAGETABLE_H_
 
-#include"../../Global.h"
+#include"Global.h"
 
 struct PageDirEntry {
 		char present :1;
diff --git a/src/multiboot_spec/multiboot.h b/src/multiboot_spec/Multiboot.h
similarity index 100%
rename from src/multiboot_spec/multiboot.h
rename to src/multiboot_spec/Multiboot.h
diff --git a/src/Utils/Linked_List/LinkedList.h b/src/utils/linked_list/LinkedList.h
similarity index 91%
rename from src/Utils/Linked_List/LinkedList.h
rename to src/utils/linked_list/LinkedList.h
index 7951b0b1d..0f5596084 100644
--- a/src/Utils/Linked_List/LinkedList.h
+++ b/src/utils/linked_list/LinkedList.h
@@ -8,8 +8,8 @@
 #ifndef SRC_UTILS_LINKEDLIST_H_
 #define SRC_UTILS_LINKEDLIST_H_
 
-#include "../../Global.h"
-#include "../linked_list/LinkedListNode.h"
+#include "Global.h"
+#include "utils/linked_list/LinkedListNode.h"
 
 template<class T>
 class LinkedList {
diff --git a/src/Utils/Linked_List/LinkedListNode.h b/src/utils/linked_list/LinkedListNode.h
similarity index 100%
rename from src/Utils/Linked_List/LinkedListNode.h
rename to src/utils/linked_list/LinkedListNode.h
diff --git a/src/Utils/Linked_List/makefile b/src/utils/linked_list/makefile
similarity index 100%
rename from src/Utils/Linked_List/makefile
rename to src/utils/linked_list/makefile
diff --git a/src/Utils/makefile b/src/utils/makefile
similarity index 100%
rename from src/Utils/makefile
rename to src/utils/makefile
diff --git a/src/utils/printf/Printf.cpp b/src/utils/printf/Printf.cpp
index dde4be360..51fd926d0 100644
--- a/src/utils/printf/Printf.cpp
+++ b/src/utils/printf/Printf.cpp
@@ -8,8 +8,8 @@
 
 /* stdarg.h is for variadics */
 #include <stdarg.h>
-#include "../../drivers/TTY/Console.h"
-#include "../printf/printf.h"
+#include "drivers/TTY/Console.h"
+#include "utils/printf/Printf.h"
 /**
  * A simple printf implementation
  * @param format string
diff --git a/src/Utils/printf/printf.h b/src/utils/printf/Printf.h
similarity index 100%
rename from src/Utils/printf/printf.h
rename to src/utils/printf/Printf.h
diff --git a/src/Utils/printf/makefile b/src/utils/printf/makefile
similarity index 100%
rename from src/Utils/printf/makefile
rename to src/utils/printf/makefile