diff --git a/src/cpu/atomic_operations.rs b/src/cpu/atomic_operations.rs
deleted file mode 100644
index 76f0ba8..0000000
--- a/src/cpu/atomic_operations.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-use crate::types::*;
-
-
-// ADDRESS MODES //
diff --git a/src/main.rs b/src/main.rs
index f4618d1..da370e4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,17 +4,13 @@ extern crate simple_logger;
 extern crate phf;
 extern crate piston_window;
 
-
-#[allow(non_snake_case)]
-mod cpu;
-mod bus;
-mod types;
+mod nes; 
 
 use std::path::Path;
 use piston_window::*;
-use types::*;
-use cpu::*;
-use bus::{MemoryBus, Bus};
+use nes::types::*;
+use nes::cpu::*;
+use nes::bus::{MemoryBus, Bus};
 use opengl_graphics::OpenGL;
 use log::Level;
 use piston_window::Text;
diff --git a/src/nes.rs b/src/nes.rs
new file mode 100644
index 0000000..7407f4d
--- /dev/null
+++ b/src/nes.rs
@@ -0,0 +1,4 @@
+#[allow(non_snake_case)]
+pub mod cpu;
+pub mod bus;
+pub mod types;
\ No newline at end of file
diff --git a/src/bus.rs b/src/nes/bus.rs
similarity index 96%
rename from src/bus.rs
rename to src/nes/bus.rs
index 15a8380..4e30e58 100644
--- a/src/bus.rs
+++ b/src/nes/bus.rs
@@ -1,4 +1,4 @@
-use crate::types::*;
+use crate::nes::types::*;
 
 pub trait Bus {
     fn readb(&self, addr: Addr) -> Byte;
diff --git a/src/cpu.rs b/src/nes/cpu.rs
similarity index 99%
rename from src/cpu.rs
rename to src/nes/cpu.rs
index d9204f7..491c048 100644
--- a/src/cpu.rs
+++ b/src/nes/cpu.rs
@@ -2,8 +2,8 @@ mod instructions;
 
 use instructions::{Instruction,Operation,AddrMode};
 use core::fmt::{Debug,Formatter,Result};
-use crate::bus::Bus;
-use crate::types::*;
+use crate::nes::bus::Bus;
+use crate::nes::types::*;
 use log::{debug};
 
 pub struct Registers {
diff --git a/src/cpu/instructions.rs b/src/nes/cpu/instructions.rs
similarity index 100%
rename from src/cpu/instructions.rs
rename to src/nes/cpu/instructions.rs
diff --git a/src/nes/disasm.rs b/src/nes/disasm.rs
new file mode 100644
index 0000000..e69de29
diff --git a/src/types.rs b/src/nes/types.rs
similarity index 100%
rename from src/types.rs
rename to src/nes/types.rs