diff --git a/hGameTest/src/game/ui/CVar.hx b/hGameTest/src/engine/CVar.hx
similarity index 88%
rename from hGameTest/src/game/ui/CVar.hx
rename to hGameTest/src/engine/CVar.hx
index cc5457b3..de1f3555 100644
--- a/hGameTest/src/game/ui/CVar.hx
+++ b/hGameTest/src/engine/CVar.hx
@@ -1,4 +1,4 @@
-package game.ui;
+package engine;
 
 
 typedef CVar = {
diff --git a/hGameTest/src/game/ui/CVarType.hx b/hGameTest/src/engine/CVarType.hx
similarity index 81%
rename from hGameTest/src/game/ui/CVarType.hx
rename to hGameTest/src/engine/CVarType.hx
index 32c4bb80..8c4ad77c 100644
--- a/hGameTest/src/game/ui/CVarType.hx
+++ b/hGameTest/src/engine/CVarType.hx
@@ -1,4 +1,4 @@
-package game.ui;
+package engine;
 
 enum CVarType {
     CInt;
diff --git a/hGameTest/src/game/ui/ConVar.hx b/hGameTest/src/engine/ConVar.hx
similarity index 99%
rename from hGameTest/src/game/ui/ConVar.hx
rename to hGameTest/src/engine/ConVar.hx
index 446841d4..3f0c6b11 100644
--- a/hGameTest/src/game/ui/ConVar.hx
+++ b/hGameTest/src/engine/ConVar.hx
@@ -1,4 +1,4 @@
-package game.ui;
+package engine;
 
 import haxe.Constraints.Function;
 import engine.typedefs.CVar;
diff --git a/hGameTest/src/game/Game.hx b/hGameTest/src/game/Game.hx
index 06cfd215..be4cc7cc 100644
--- a/hGameTest/src/game/Game.hx
+++ b/hGameTest/src/game/Game.hx
@@ -7,7 +7,7 @@ import openfl.display.Sprite;
 import openfl.events.Event;
 import assets.Scanner;
 import assets.HTex;
-import game.ui.ConVar;
+import engine.ConVar;
 import game.ui.console.Console;
 
 class Game
@@ -41,20 +41,9 @@ class Game
         uiLayer = new Sprite();
         stage.addChild(gameLayer);
         stage.addChild(uiLayer);
-		//player.graphics.lineStyle(2,0xFF0000);
-        //player.graphics.drawRect(0,0,16,16);
-        // var bitmapData:BitmapData = Assets.getBitmapData("textures/sprites/character.png");
-        //player = new Player();
-        //gameLayer.addChild(player.sprite);
         uiLayer.addChild(console);
-        var cvar_cl_kankerlow:CVar = ConVar.registerCVar("cl_kankerlow", CInt, 10, FCVAR_ARCHIVE, "is de speler een kankerlow?",null,false,false,0,0,false);
-        //var sheet:SpriteSheet = new SpriteSheet(sheetData);
-        //var playerBitmap:Bitmap = new Bitmap(Tileset.tilesetMap["testsheet"].tileMap["testTile5"]);
-        //var someotherbitmap:Bitmap = new Bitmap(Tileset.tilesetMap["testsheet"].tileMap["testTile3"]);
-        //playerBitmap.scaleX = playerBitmap.scaleY = 10;
-        //player.addChild(playerBitmap);
-        //TextureData.parseConfig();
-        //Sys.
+        //var cvar_cl_kankerlow:CVar = ConVar.registerCVar("cl_kankerlow", CInt, 10, FCVAR_ARCHIVE, "is de speler een kankerlow?",null,false,false,0,0,false);
+        
 	}
 	public function onEnterFrame(e:Event):Void
 	{
diff --git a/hGameTest/src/game/Input.hx b/hGameTest/src/game/Input.hx
index f52550d2..58447631 100644
--- a/hGameTest/src/game/Input.hx
+++ b/hGameTest/src/game/Input.hx
@@ -8,9 +8,9 @@ import game.video.Mode;
 import openfl.events.KeyboardEvent;
 import openfl.ui.Keyboard in Kb;
 import openfl.Lib;
-import game.ui.CVarType;
-import game.ui.CVar;
-import game.ui.ConVar;
+import engine.enums.CVarType;
+import engine.typedefs.CVar;
+import engine.ConVar;
 
 class Input{
     public static var keys:Map<Int,Bool> = [];
@@ -58,8 +58,10 @@ class Input{
 
     }
     public static function onKeyIsUp(e:KeyboardEvent){
-        if(bindMap[keyNameMap[e.keyCode]].indexOf("+") == 0){
-            Console.consoleInstance.parseCmd(StringTools.replace(bindMap[keyNameMap[e.keyCode]],"+","-"));
+        if(!Std.isOfType(Lib.current.stage.focus,TextField)){
+            if(bindMap[keyNameMap[e.keyCode]].indexOf("+") == 0){
+                Console.consoleInstance.parseCmd(StringTools.replace(bindMap[keyNameMap[e.keyCode]],"+","-"));
+            }
         }
         keys[e.keyCode] = false;
     }
@@ -112,6 +114,12 @@ class Input{
             if (keys[Kb.DOWN] && !keysLast[Kb.DOWN]){
                 Console.histNext();
             }
+            
+        }
+        if(Console.consoleInstance.visible){
+            if (keys[Kb.ESCAPE]){
+                Console.toggle();
+            }
         }
         keysLast = keys.copy();
     }
diff --git a/hGameTest/src/game/ui/console/Console.hx b/hGameTest/src/game/ui/console/Console.hx
index f0a56296..55dd6714 100644
--- a/hGameTest/src/game/ui/console/Console.hx
+++ b/hGameTest/src/game/ui/console/Console.hx
@@ -12,7 +12,7 @@ import openfl.Assets;
 import openfl.text.TextFormat;
 import openfl.text.TextFieldType;
 import engine.typedefs.CVar;
-import game.ui.ConVar;
+import engine.ConVar;
 import engine.typedefs.CCmd;
 import game.ui.console.elements.ConsoleInput;
 
diff --git a/hGameTest/src/game/video/Mode.hx b/hGameTest/src/game/video/Mode.hx
index eee4bb0a..eacb9c22 100644
--- a/hGameTest/src/game/video/Mode.hx
+++ b/hGameTest/src/game/video/Mode.hx
@@ -1,5 +1,6 @@
 package game.video;
 
+import engine.ConVar;
 import openfl.Lib;
 import openfl.display.StageDisplayState;