diff --git a/src/Kernel.hh b/src/Kernel.hh
index f6ec3ef..08d6f87 100644
--- a/src/Kernel.hh
+++ b/src/Kernel.hh
@@ -11,9 +11,9 @@
 
 #include "Attributes.hh"
 #include "Console.hh"
-#include "Memory.hh"
 #include "Multiboot.hh"
 #include "kstd/Types.hh"
+#include "memory/Memory.hh"
 
 
 namespace kernel {
diff --git a/src/SConscript b/src/SConscript
index d3af908..c57a27d 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -15,7 +15,6 @@ files = [
     'Descriptors.cc',
     'Interrupts.cc',
     'Kernel.cc',
-    'Memory.cc',
     'Multiboot.cc',
     'PIC.cc',
     'cxa.cc',
@@ -23,6 +22,8 @@ files = [
 
     'kstd/CString.cc',
     'kstd/Memory.cc',
+
+    'memory/Memory.cc',
 ]
 
 toolchain_bin = Dir(os.environ['POLKA_TOOLCHAIN']).Dir('bin')
diff --git a/src/Memory.cc b/src/memory/Memory.cc
similarity index 99%
rename from src/Memory.cc
rename to src/memory/Memory.cc
index 66342a6..7045ac0 100644
--- a/src/Memory.cc
+++ b/src/memory/Memory.cc
@@ -33,5 +33,5 @@ MemoryManager::initializeGDT()
     mGDT.setDescriptor(2, x86::GDT::DescriptorSpec::kernelSegment(0, 0xFFFFFFFF, x86::GDT::Type::DataRW));
     mGDT.load();
 }
-    
+
 } /* namespace kernel */
diff --git a/src/Memory.hh b/src/memory/Memory.hh
similarity index 98%
rename from src/Memory.hh
rename to src/memory/Memory.hh
index 257c17a..6557196 100644
--- a/src/Memory.hh
+++ b/src/memory/Memory.hh
@@ -24,7 +24,7 @@ private:
 
     void initializeGDT();
 };
-    
+
 } /* namespace kernel */
 
 #endif /* __MEMORY_HH__ */