diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1148705..331e0b4 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,9 +12,9 @@
         },
         {
             "type": "java",
-            "name": "Debug (Launch)-Init<pixels>",
+            "name": "Debug (Launch)-GameManager<pixels>",
             "request": "launch",
-            "mainClass": "bz.bronze.pixels.Init",
+            "mainClass": "bz.bronze.pixels.game.GameManager",
             "projectName": "pixels"
         }
     ]
diff --git a/pixels/bin/bz/bronze/pixels/AbstractGame.class b/pixels/bin/bz/bronze/pixels/AbstractGame.class
deleted file mode 100644
index 9c81b9a..0000000
Binary files a/pixels/bin/bz/bronze/pixels/AbstractGame.class and /dev/null differ
diff --git a/pixels/bin/bz/bronze/pixels/Gameloop.class b/pixels/bin/bz/bronze/pixels/Gameloop.class
deleted file mode 100644
index d6558f5..0000000
Binary files a/pixels/bin/bz/bronze/pixels/Gameloop.class and /dev/null differ
diff --git a/pixels/bin/bz/bronze/pixels/Init.class b/pixels/bin/bz/bronze/pixels/Init.class
deleted file mode 100644
index f45f13b..0000000
Binary files a/pixels/bin/bz/bronze/pixels/Init.class and /dev/null differ
diff --git a/pixels/bin/bz/bronze/pixels/Input.class b/pixels/bin/bz/bronze/pixels/Input.class
deleted file mode 100644
index 98a8b72..0000000
Binary files a/pixels/bin/bz/bronze/pixels/Input.class and /dev/null differ
diff --git a/pixels/bin/bz/bronze/pixels/Renderer.class b/pixels/bin/bz/bronze/pixels/Renderer.class
deleted file mode 100644
index 70154f3..0000000
Binary files a/pixels/bin/bz/bronze/pixels/Renderer.class and /dev/null differ
diff --git a/pixels/bin/bz/bronze/pixels/Window.class b/pixels/bin/bz/bronze/pixels/Window.class
deleted file mode 100644
index 6de8b33..0000000
Binary files a/pixels/bin/bz/bronze/pixels/Window.class and /dev/null differ
diff --git a/pixels/bin/bz/bronze/pixels/game/GameManager.class b/pixels/bin/bz/bronze/pixels/game/GameManager.class
new file mode 100644
index 0000000..f9123e8
Binary files /dev/null and b/pixels/bin/bz/bronze/pixels/game/GameManager.class differ
diff --git a/pixels/src/bz/bronze/pixels/AbstractGame.java b/pixels/src/bz/bronze/pixels/engine/AbstractGame.java
similarity index 78%
rename from pixels/src/bz/bronze/pixels/AbstractGame.java
rename to pixels/src/bz/bronze/pixels/engine/AbstractGame.java
index 9bcdcf9..da770a2 100644
--- a/pixels/src/bz/bronze/pixels/AbstractGame.java
+++ b/pixels/src/bz/bronze/pixels/engine/AbstractGame.java
@@ -1,4 +1,4 @@
-package bz.bronze.pixels;
+package bz.bronze.pixels.engine;
 
 public abstract class AbstractGame {
     public abstract void update(float dt);
diff --git a/pixels/src/bz/bronze/pixels/Gameloop.java b/pixels/src/bz/bronze/pixels/engine/GameContainer.java
similarity index 89%
rename from pixels/src/bz/bronze/pixels/Gameloop.java
rename to pixels/src/bz/bronze/pixels/engine/GameContainer.java
index 34a91a7..94e0176 100644
--- a/pixels/src/bz/bronze/pixels/Gameloop.java
+++ b/pixels/src/bz/bronze/pixels/engine/GameContainer.java
@@ -1,23 +1,23 @@
-package bz.bronze.pixels;
+package bz.bronze.pixels.engine;
 
-import java.awt.event.KeyEvent;
-
-public class Gameloop implements Runnable {
+public class GameContainer implements Runnable {
     private Thread thread;
+    private Window window;
     private Renderer renderer;
-    private Input input;
+    public Input input;
     private AbstractGame game;
 
     private boolean running = false;
-    private final double TPS = 1.0/60.0;
+    private final double TPS = 1.0 / 60.0;
 
     private String metrics;
-    
-    public Gameloop(AbstractGame game) {
+
+    public GameContainer(AbstractGame game) {
         this.game = game;
     }
 
     public void start() {
+        window = new Window();
         renderer = new Renderer();
         input = new Input();
         
diff --git a/pixels/src/bz/bronze/pixels/Init.java b/pixels/src/bz/bronze/pixels/engine/Init.java
similarity index 60%
rename from pixels/src/bz/bronze/pixels/Init.java
rename to pixels/src/bz/bronze/pixels/engine/Init.java
index 7bc7f20..48873b5 100644
--- a/pixels/src/bz/bronze/pixels/Init.java
+++ b/pixels/src/bz/bronze/pixels/engine/Init.java
@@ -1,9 +1,8 @@
-package bz.bronze.pixels;
+package bz.bronze.pixels.engine;
 
 public class Init {
-    
     static Window window = new Window();
-    static Gameloop game = new Gameloop();
+    //static Gameloop game = new Gameloop();
 
     public static void print(String out) {
         System.out.println(out);
@@ -11,13 +10,13 @@ public class Init {
 
     public static void init() {
         window.create();
-        game.start();
+        //game.start();
         
         print("Window Initialized!");
         print("Gameloop Started!");
     }
     
-    public static void main(String[] args) throws Exception {
-        init();
-    }
+    //public static void main(String[] args) throws Exception {
+        //init();
+    //}
 }
\ No newline at end of file
diff --git a/pixels/src/bz/bronze/pixels/Input.java b/pixels/src/bz/bronze/pixels/engine/Input.java
similarity index 98%
rename from pixels/src/bz/bronze/pixels/Input.java
rename to pixels/src/bz/bronze/pixels/engine/Input.java
index 438bbc2..5bf6235 100644
--- a/pixels/src/bz/bronze/pixels/Input.java
+++ b/pixels/src/bz/bronze/pixels/engine/Input.java
@@ -1,4 +1,4 @@
-package bz.bronze.pixels;
+package bz.bronze.pixels.engine;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
diff --git a/pixels/src/bz/bronze/pixels/Renderer.java b/pixels/src/bz/bronze/pixels/engine/Renderer.java
similarity index 93%
rename from pixels/src/bz/bronze/pixels/Renderer.java
rename to pixels/src/bz/bronze/pixels/engine/Renderer.java
index 84757de..0526a5e 100644
--- a/pixels/src/bz/bronze/pixels/Renderer.java
+++ b/pixels/src/bz/bronze/pixels/engine/Renderer.java
@@ -1,4 +1,4 @@
-package bz.bronze.pixels;
+package bz.bronze.pixels.engine;
 
 import java.awt.image.DataBufferInt;
 
diff --git a/pixels/src/bz/bronze/pixels/Window.java b/pixels/src/bz/bronze/pixels/engine/Window.java
similarity index 97%
rename from pixels/src/bz/bronze/pixels/Window.java
rename to pixels/src/bz/bronze/pixels/engine/Window.java
index 9e653c0..d60086d 100644
--- a/pixels/src/bz/bronze/pixels/Window.java
+++ b/pixels/src/bz/bronze/pixels/engine/Window.java
@@ -1,4 +1,4 @@
-package bz.bronze.pixels;
+package bz.bronze.pixels.engine;
 
 import java.awt.BorderLayout;
 import java.awt.Canvas;
diff --git a/pixels/src/bz/bronze/pixels/game/GameManager.java b/pixels/src/bz/bronze/pixels/game/GameManager.java
new file mode 100644
index 0000000..d69aec3
--- /dev/null
+++ b/pixels/src/bz/bronze/pixels/game/GameManager.java
@@ -0,0 +1,32 @@
+package bz.bronze.pixels.game;
+
+import java.awt.event.KeyEvent;
+
+import bz.bronze.pixels.engine.AbstractGame;
+import bz.bronze.pixels.engine.GameContainer;
+import bz.bronze.pixels.engine.Renderer;
+
+public class GameManager extends AbstractGame {
+    static GameContainer gc;
+    
+    public GameManager() {
+
+    }
+
+    @Override
+    public void update(float dt) {
+        if (gc.input.isKey(KeyEvent.VK_SPACE)) {
+            System.out.println("pop goes the weasel");
+        }
+    }
+
+    @Override
+    public void render(Renderer r) {
+
+	}
+    
+    public static void main(String[] args) {
+        gc = new GameContainer(new GameManager());
+        gc.start();
+    }
+}
\ No newline at end of file