diff --git a/Bin/Makefile b/Bin/Makefile
index 4920ab1..3470f8b 100644
--- a/Bin/Makefile
+++ b/Bin/Makefile
@@ -9,13 +9,13 @@ default: all
 
 all:
 	$(MAKE) -C ../src/libUnuk/Engine
-	$(MAKE) -C ../src/libUnuk/Map
+	$(MAKE) -C ../src/libUnuk/LevelGen
 	$(MAKE) -C ../src/libUnuk/Sprite
 	$(MAKE) -C ../src/libUnuk/System
 	$(MAKE) -C ../src/libUnuk/UI
 	$(MAKE) -C ../src/Unuk
 	
-	$(CC) $(CFLAGS) -o Unuk ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ../src/libUnuk/Map/*.o \
+	$(CC) $(CFLAGS) -o Unuk ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ../src/libUnuk/LevelGen/*.o \
                           ../src/libUnuk/Sprite/*.o ../src/libUnuk/System/*.o ../src/libUnuk/UI/*.o \
                           ../src/Unuk/*.o $(LDADD)
 
@@ -23,19 +23,19 @@ static:
 	@echo -e "\033[1;31mThis is an experimental build, if it does not work, don't complain...\033[0m"
 	@sleep 1
 	$(MAKE) -C ../src/libUnuk/Engine
-	$(MAKE) -C ../src/libUnuk/Map
+	$(MAKE) -C ../src/libUnuk/LevelGen
 	$(MAKE) -C ../src/libUnuk/Sprite
 	$(MAKE) -C ../src/libUnuk/System
 	$(MAKE) -C ../src/libUnuk/UI
 	$(MAKE) -C ../src/Unuk
 	
-	$(CC) $(CFLAGS) -o build/Unuk-static ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ..src/libUnuk/Map/*.o \
+	$(CC) $(CFLAGS) -o build/Unuk-static ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ..src/libUnuk/LevelGen/*.o \
                                        ../src/libUnuk/Sprite/*.o ../src/libUnuk/System/*.o ../src/libUnuk/UI/*.o \
                                        ../src/Unuk/*.o $(LDADDSTATIC)
 
 clean:
 	$(MAKE) -C ../src/libUnuk/Engine       clean
-	$(MAKE) -C ../src/libUnuk/Map          clean
+	$(MAKE) -C ../src/libUnuk/LevelGen     clean
 	$(MAKE) -C ../src/libUnuk/Sprite       clean
 	$(MAKE) -C ../src/libUnuk/System       clean
 	$(MAKE) -C ../src/libUnuk/UI           clean
diff --git a/Data/Media/Images/Characters/Player.png b/Data/Media/Images/Characters/Player.png
new file mode 100644
index 0000000..23a2fdf
Binary files /dev/null and b/Data/Media/Images/Characters/Player.png differ
diff --git a/Data/Media/Images/Characters/template.png b/Data/Media/Images/Characters/template.png
index 6628413..eddb8cd 100644
Binary files a/Data/Media/Images/Characters/template.png and b/Data/Media/Images/Characters/template.png differ
diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile
index bc2faab..18a8583 100644
--- a/Unuk-QT/Makefile
+++ b/Unuk-QT/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: Unuk-QT
-# Generated by qmake (2.01a) (Qt 4.7.3) on: Sat Jan 14 03:32:22 2012
+# Generated by qmake (2.01a) (Qt 4.7.3) on: Sat Jan 14 18:40:02 2012
 # Project:  Unuk-QT.pro
 # Template: app
 # Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
@@ -50,9 +50,6 @@ SOURCES       = ../src/libUnuk/Engine/WorldManager.cpp \
 		../src/libUnuk/Engine/Collision.cpp \
 		../src/libUnuk/Engine/Character.cpp \
 		../src/libUnuk/Engine/AStar.cpp \
-		../src/libUnuk/Map/MapEntities.cpp \
-		../src/libUnuk/Map/MapElement.cpp \
-		../src/libUnuk/Map/Map.cpp \
 		../src/libUnuk/Sprite/TextureManager.cpp \
 		../src/libUnuk/Sprite/Texture.cpp \
 		../src/libUnuk/Sprite/ImageLoader.cpp \
@@ -72,7 +69,10 @@ SOURCES       = ../src/libUnuk/Engine/WorldManager.cpp \
 		../src/Unuk/Player.cpp \
 		../src/Unuk/main.cpp \
 		../src/Unuk/Globals.cpp \
-		../src/Unuk/Game.cpp 
+		../src/Unuk/Game.cpp \
+		../src/libUnuk/LevelGen/LevelGen.cpp \
+		../src/libUnuk/LevelGen/MapEntities.cpp \
+		../src/libUnuk/LevelGen/MapElement.cpp 
 OBJECTS       = WorldManager.o \
 		ParticleEmitter.o \
 		NPC.o \
@@ -80,9 +80,6 @@ OBJECTS       = WorldManager.o \
 		Collision.o \
 		Character.o \
 		AStar.o \
-		MapEntities.o \
-		MapElement.o \
-		Map.o \
 		TextureManager.o \
 		Texture.o \
 		ImageLoader.o \
@@ -102,7 +99,10 @@ OBJECTS       = WorldManager.o \
 		Player.o \
 		main.o \
 		Globals.o \
-		Game.o
+		Game.o \
+		LevelGen.o \
+		MapEntities.o \
+		MapElement.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
@@ -202,7 +202,7 @@ qmake:  FORCE
 
 dist: 
 	@$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Engine/WorldManager.h ../src/libUnuk/Engine/ParticleEmitter.h ../src/libUnuk/Engine/NPC.h ../src/libUnuk/Engine/MemManager.h ../src/libUnuk/Engine/MemClass.h ../src/libUnuk/Engine/Collision.h ../src/libUnuk/Engine/Character.h ../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStar.h ../src/libUnuk/Map/MapTile.h ../src/libUnuk/Map/MapEntities.h ../src/libUnuk/Map/MapElement.h ../src/libUnuk/Map/Map.h ../src/libUnuk/Sprite/TextureManager.h ../src/libUnuk/Sprite/Texture.h ../src/libUnuk/Sprite/ImageLoader.h ../src/libUnuk/Sprite/ApplySurface.h ../src/libUnuk/System/Rect.h ../src/libUnuk/System/Input.h ../src/libUnuk/System/FPS.h ../src/libUnuk/System/Debug.h ../src/libUnuk/System/Timer.h ../src/libUnuk/UI/MainMenu.h ../src/libUnuk/UI/IngameMenu.h ../src/libUnuk/UI/Font.h ../src/libUnuk/UI/ButtonToggle.h ../src/libUnuk/UI/ButtonGroup.h ../src/libUnuk/UI/Button.h ../src/libUnuk/UI/Text.h ../src/Unuk/Globals.h ../src/Unuk/Game.h ../src/Unuk/Constants.h ../src/Unuk/Player.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/ParticleEmitter.cpp ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/MemManager.cpp ../src/libUnuk/Engine/Collision.cpp ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Map/MapEntities.cpp ../src/libUnuk/Map/MapElement.cpp ../src/libUnuk/Map/Map.cpp ../src/libUnuk/Sprite/TextureManager.cpp ../src/libUnuk/Sprite/Texture.cpp ../src/libUnuk/Sprite/ImageLoader.cpp ../src/libUnuk/Sprite/ApplySurface.cpp ../src/libUnuk/System/Timer.cpp ../src/libUnuk/System/Rect.cpp ../src/libUnuk/System/Input.cpp ../src/libUnuk/System/FPS.cpp ../src/libUnuk/System/Debug.cpp ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/Button.cpp ../src/Unuk/Player.cpp ../src/Unuk/main.cpp ../src/Unuk/Globals.cpp ../src/Unuk/Game.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Engine/WorldManager.h ../src/libUnuk/Engine/ParticleEmitter.h ../src/libUnuk/Engine/NPC.h ../src/libUnuk/Engine/MemManager.h ../src/libUnuk/Engine/MemClass.h ../src/libUnuk/Engine/Collision.h ../src/libUnuk/Engine/Character.h ../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStar.h ../src/libUnuk/Sprite/TextureManager.h ../src/libUnuk/Sprite/Texture.h ../src/libUnuk/Sprite/ImageLoader.h ../src/libUnuk/Sprite/ApplySurface.h ../src/libUnuk/System/Rect.h ../src/libUnuk/System/Input.h ../src/libUnuk/System/FPS.h ../src/libUnuk/System/Debug.h ../src/libUnuk/System/Timer.h ../src/libUnuk/UI/MainMenu.h ../src/libUnuk/UI/IngameMenu.h ../src/libUnuk/UI/Font.h ../src/libUnuk/UI/ButtonToggle.h ../src/libUnuk/UI/ButtonGroup.h ../src/libUnuk/UI/Button.h ../src/libUnuk/UI/Text.h ../src/Unuk/Globals.h ../src/Unuk/Game.h ../src/Unuk/Constants.h ../src/Unuk/Player.h ../src/libUnuk/LevelGen/LevelGen.h ../src/libUnuk/LevelGen/MapEntities.h ../src/libUnuk/LevelGen/MapElement.h ../src/libUnuk/LevelGen/MapTile.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/ParticleEmitter.cpp ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/MemManager.cpp ../src/libUnuk/Engine/Collision.cpp ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Sprite/TextureManager.cpp ../src/libUnuk/Sprite/Texture.cpp ../src/libUnuk/Sprite/ImageLoader.cpp ../src/libUnuk/Sprite/ApplySurface.cpp ../src/libUnuk/System/Timer.cpp ../src/libUnuk/System/Rect.cpp ../src/libUnuk/System/Input.cpp ../src/libUnuk/System/FPS.cpp ../src/libUnuk/System/Debug.cpp ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/Button.cpp ../src/Unuk/Player.cpp ../src/Unuk/main.cpp ../src/Unuk/Globals.cpp ../src/Unuk/Game.cpp ../src/libUnuk/LevelGen/LevelGen.cpp ../src/libUnuk/LevelGen/MapEntities.cpp ../src/libUnuk/LevelGen/MapElement.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0
 
 
 clean:compiler_clean 
@@ -255,12 +255,14 @@ WorldManager.o: ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/Wor
 		../src/libUnuk/System/Debug.h \
 		../src/libUnuk/Sprite/ImageLoader.h \
 		../src/libUnuk/Engine/Collision.h \
-		../src/libUnuk/Map/Map.h \
-		../src/libUnuk/Map/MapTile.h \
-		../src/libUnuk/Map/MapElement.h \
+		../src/libUnuk/LevelGen/LevelGen.h \
+		../src/libUnuk/LevelGen/MapTile.h \
+		../src/libUnuk/LevelGen/MapElement.h \
 		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Map/MapEntities.h \
+		../src/libUnuk/LevelGen/MapEntities.h \
 		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h \
 		../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WorldManager.o ../src/libUnuk/Engine/WorldManager.cpp
@@ -282,13 +284,15 @@ NPC.o: ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/NPC.h \
 		../src/libUnuk/System/Debug.h \
 		../src/libUnuk/Sprite/ImageLoader.h \
 		../src/libUnuk/Engine/Collision.h \
-		../src/libUnuk/Map/Map.h \
-		../src/libUnuk/Map/MapTile.h \
-		../src/libUnuk/Map/MapElement.h \
+		../src/libUnuk/LevelGen/LevelGen.h \
+		../src/libUnuk/LevelGen/MapTile.h \
+		../src/libUnuk/LevelGen/MapElement.h \
 		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Map/MapEntities.h \
+		../src/libUnuk/LevelGen/MapEntities.h \
 		../src/libUnuk/Engine/WorldManager.h \
 		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h \
 		../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o NPC.o ../src/libUnuk/Engine/NPC.cpp
@@ -309,57 +313,21 @@ Character.o: ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/Character
 		../src/libUnuk/System/Debug.h \
 		../src/libUnuk/Sprite/ImageLoader.h \
 		../src/libUnuk/Engine/Collision.h \
-		../src/libUnuk/Map/Map.h \
-		../src/libUnuk/Map/MapTile.h \
-		../src/libUnuk/Map/MapElement.h \
+		../src/libUnuk/LevelGen/LevelGen.h \
+		../src/libUnuk/LevelGen/MapTile.h \
+		../src/libUnuk/LevelGen/MapElement.h \
 		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Map/MapEntities.h \
+		../src/libUnuk/LevelGen/MapEntities.h \
 		../src/libUnuk/Engine/WorldManager.h \
-		../src/libUnuk/System/Timer.h
+		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Character.o ../src/libUnuk/Engine/Character.cpp
 
 AStar.o: ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o AStar.o ../src/libUnuk/Engine/AStar.cpp
 
-MapEntities.o: ../src/libUnuk/Map/MapEntities.cpp ../src/libUnuk/Map/MapEntities.h \
-		../src/libUnuk/Map/MapElement.h \
-		../src/Unuk/Globals.h \
-		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h \
-		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Sprite/ImageLoader.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o MapEntities.o ../src/libUnuk/Map/MapEntities.cpp
-
-MapElement.o: ../src/libUnuk/Map/MapElement.cpp ../src/libUnuk/Map/MapElement.h \
-		../src/Unuk/Globals.h \
-		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h \
-		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Sprite/ImageLoader.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o MapElement.o ../src/libUnuk/Map/MapElement.cpp
-
-Map.o: ../src/libUnuk/Map/Map.cpp ../src/libUnuk/Map/Map.h \
-		../src/Unuk/Globals.h \
-		../src/Unuk/Constants.h \
-		../src/libUnuk/Sprite/ImageLoader.h \
-		../src/libUnuk/System/Debug.h \
-		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/Map/MapTile.h \
-		../src/libUnuk/Map/MapElement.h \
-		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Map/MapEntities.h \
-		../src/libUnuk/Engine/WorldManager.h \
-		../src/libUnuk/Engine/NPC.h \
-		../src/libUnuk/Engine/Character.h \
-		../src/libUnuk/Engine/MemClass.h \
-		../src/libUnuk/Engine/MemManager.h \
-		../src/libUnuk/Engine/Collision.h \
-		../src/libUnuk/System/Timer.h \
-		../src/libUnuk/Engine/AStar.h \
-		../src/libUnuk/Engine/AStarBase.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Map.o ../src/libUnuk/Map/Map.cpp
-
 TextureManager.o: ../src/libUnuk/Sprite/TextureManager.cpp ../src/libUnuk/Sprite/TextureManager.h \
 		../src/libUnuk/Sprite/ImageLoader.h \
 		../src/Unuk/Globals.h \
@@ -406,7 +374,8 @@ Debug.o: ../src/libUnuk/System/Debug.cpp ../src/libUnuk/System/Debug.h
 Text.o: ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/Text.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Text.o ../src/libUnuk/UI/Text.cpp
 
 MainMenu.o: ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/MainMenu.h \
@@ -414,30 +383,39 @@ MainMenu.o: ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/MainMenu.h \
 		../src/libUnuk/System/FPS.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/System/Timer.h \
-		../src/libUnuk/Map/Map.h \
-		../src/libUnuk/Sprite/ImageLoader.h \
-		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/ButtonGroup.h \
+		../src/libUnuk/UI/Button.h \
+		../src/libUnuk/System/Input.h \
+		../src/libUnuk/UI/Text.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/Map/MapTile.h \
-		../src/libUnuk/Map/MapElement.h \
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/Engine/MemClass.h \
+		../src/libUnuk/Engine/MemManager.h \
+		../src/libUnuk/LevelGen/LevelGen.h \
+		../src/libUnuk/Sprite/ImageLoader.h \
+		../src/libUnuk/LevelGen/MapTile.h \
+		../src/libUnuk/LevelGen/MapElement.h \
 		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Map/MapEntities.h \
-		../src/libUnuk/Engine/WorldManager.h \
-		../src/libUnuk/System/Rect.h
+		../src/libUnuk/LevelGen/MapEntities.h \
+		../src/libUnuk/Engine/WorldManager.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainMenu.o ../src/libUnuk/UI/MainMenu.cpp
 
 IngameMenu.o: ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/IngameMenu.h \
 		../src/Unuk/Globals.h \
 		../src/Unuk/Constants.h \
 		../src/libUnuk/UI/ButtonGroup.h \
-		../src/libUnuk/Engine/MemClass.h \
-		../src/libUnuk/Engine/MemManager.h \
-		../src/libUnuk/UI/ButtonToggle.h \
 		../src/libUnuk/UI/Button.h \
 		../src/libUnuk/System/Input.h \
-		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/UI/Text.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/Engine/MemClass.h \
+		../src/libUnuk/Engine/MemManager.h \
+		../src/libUnuk/UI/ButtonToggle.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o IngameMenu.o ../src/libUnuk/UI/IngameMenu.cpp
 
 Font.o: ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/Font.h \
@@ -448,12 +426,22 @@ ButtonToggle.o: ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonToggl
 		../src/libUnuk/UI/Button.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/System/Input.h \
-		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/UI/Text.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonToggle.o ../src/libUnuk/UI/ButtonToggle.cpp
 
 ButtonGroup.o: ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/ButtonGroup.h \
+		../src/libUnuk/UI/Button.h \
+		../src/Unuk/Globals.h \
+		../src/libUnuk/System/Input.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/Sprite/ApplySurface.h \
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h \
 		../src/libUnuk/Engine/MemClass.h \
 		../src/libUnuk/Engine/MemManager.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonGroup.o ../src/libUnuk/UI/ButtonGroup.cpp
@@ -461,9 +449,11 @@ ButtonGroup.o: ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/ButtonGroup.h
 Button.o: ../src/libUnuk/UI/Button.cpp ../src/libUnuk/UI/Button.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/System/Input.h \
-		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/UI/Text.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Button.o ../src/libUnuk/UI/Button.cpp
 
 Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \
@@ -476,36 +466,48 @@ Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \
 		../src/libUnuk/System/Debug.h \
 		../src/libUnuk/Sprite/ImageLoader.h \
 		../src/libUnuk/Engine/Collision.h \
-		../src/libUnuk/Map/Map.h \
-		../src/libUnuk/Map/MapTile.h \
-		../src/libUnuk/Map/MapElement.h \
+		../src/libUnuk/LevelGen/LevelGen.h \
+		../src/libUnuk/LevelGen/MapTile.h \
+		../src/libUnuk/LevelGen/MapElement.h \
 		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Map/MapEntities.h \
-		../src/libUnuk/Engine/WorldManager.h \
-		../src/libUnuk/System/Timer.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Player.o ../src/Unuk/Player.cpp
-
-main.o: ../src/Unuk/main.cpp ../src/libUnuk/Engine/NPC.h \
-		../src/libUnuk/Engine/Character.h \
-		../src/Unuk/Globals.h \
-		../src/Unuk/Constants.h \
-		../src/libUnuk/Engine/MemClass.h \
-		../src/libUnuk/Engine/MemManager.h \
-		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h \
-		../src/libUnuk/Sprite/ImageLoader.h \
-		../src/libUnuk/Engine/Collision.h \
-		../src/libUnuk/Map/Map.h \
-		../src/libUnuk/Map/MapTile.h \
-		../src/libUnuk/Map/MapElement.h \
-		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Map/MapEntities.h \
+		../src/libUnuk/LevelGen/MapEntities.h \
 		../src/libUnuk/Engine/WorldManager.h \
 		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Player.o ../src/Unuk/Player.cpp
+
+main.o: ../src/Unuk/main.cpp ../src/libUnuk/UI/MainMenu.h \
+		../src/Unuk/Constants.h \
+		../src/libUnuk/System/FPS.h \
+		../src/Unuk/Globals.h \
+		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/ButtonGroup.h \
+		../src/libUnuk/UI/Button.h \
+		../src/libUnuk/System/Input.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/Sprite/ApplySurface.h \
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/Engine/MemClass.h \
+		../src/libUnuk/Engine/MemManager.h \
+		../src/libUnuk/LevelGen/LevelGen.h \
+		../src/libUnuk/Sprite/ImageLoader.h \
+		../src/libUnuk/LevelGen/MapTile.h \
+		../src/libUnuk/LevelGen/MapElement.h \
+		../src/libUnuk/Sprite/TextureManager.h \
+		../src/libUnuk/LevelGen/MapEntities.h \
+		../src/libUnuk/Engine/WorldManager.h \
+		../src/libUnuk/Engine/NPC.h \
+		../src/libUnuk/Engine/Character.h \
+		../src/libUnuk/Engine/Collision.h \
 		../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h \
 		../src/Unuk/Game.h \
-		../src/Unuk/Player.h
+		../src/Unuk/Player.h \
+		../src/libUnuk/UI/IngameMenu.h \
+		../src/libUnuk/UI/ButtonToggle.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../src/Unuk/main.cpp
 
 Globals.o: ../src/Unuk/Globals.cpp ../src/Unuk/Globals.h
@@ -522,18 +524,66 @@ Game.o: ../src/Unuk/Game.cpp ../src/Unuk/Game.h \
 		../src/libUnuk/System/Debug.h \
 		../src/libUnuk/Sprite/ImageLoader.h \
 		../src/libUnuk/Engine/Collision.h \
-		../src/libUnuk/Map/Map.h \
-		../src/libUnuk/Map/MapTile.h \
-		../src/libUnuk/Map/MapElement.h \
+		../src/libUnuk/LevelGen/LevelGen.h \
+		../src/libUnuk/LevelGen/MapTile.h \
+		../src/libUnuk/LevelGen/MapElement.h \
 		../src/libUnuk/Sprite/TextureManager.h \
-		../src/libUnuk/Map/MapEntities.h \
+		../src/libUnuk/LevelGen/MapEntities.h \
 		../src/libUnuk/Engine/WorldManager.h \
 		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/UI/IngameMenu.h \
+		../src/libUnuk/UI/ButtonGroup.h \
+		../src/libUnuk/UI/Button.h \
+		../src/libUnuk/System/Input.h \
+		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/UI/ButtonToggle.h \
 		../src/libUnuk/Engine/NPC.h \
 		../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Game.o ../src/Unuk/Game.cpp
 
+LevelGen.o: ../src/libUnuk/LevelGen/LevelGen.cpp ../src/libUnuk/LevelGen/LevelGen.h \
+		../src/Unuk/Globals.h \
+		../src/Unuk/Constants.h \
+		../src/libUnuk/Sprite/ImageLoader.h \
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/Sprite/ApplySurface.h \
+		../src/libUnuk/LevelGen/MapTile.h \
+		../src/libUnuk/LevelGen/MapElement.h \
+		../src/libUnuk/Sprite/TextureManager.h \
+		../src/libUnuk/LevelGen/MapEntities.h \
+		../src/libUnuk/Engine/WorldManager.h \
+		../src/libUnuk/Engine/NPC.h \
+		../src/libUnuk/Engine/Character.h \
+		../src/libUnuk/Engine/MemClass.h \
+		../src/libUnuk/Engine/MemManager.h \
+		../src/libUnuk/Engine/Collision.h \
+		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/Engine/AStar.h \
+		../src/libUnuk/Engine/AStarBase.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o LevelGen.o ../src/libUnuk/LevelGen/LevelGen.cpp
+
+MapEntities.o: ../src/libUnuk/LevelGen/MapEntities.cpp ../src/libUnuk/LevelGen/MapEntities.h \
+		../src/libUnuk/LevelGen/MapElement.h \
+		../src/Unuk/Globals.h \
+		../src/libUnuk/Sprite/ApplySurface.h \
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/Sprite/TextureManager.h \
+		../src/libUnuk/Sprite/ImageLoader.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o MapEntities.o ../src/libUnuk/LevelGen/MapEntities.cpp
+
+MapElement.o: ../src/libUnuk/LevelGen/MapElement.cpp ../src/libUnuk/LevelGen/MapElement.h \
+		../src/Unuk/Globals.h \
+		../src/libUnuk/Sprite/ApplySurface.h \
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/Sprite/TextureManager.h \
+		../src/libUnuk/Sprite/ImageLoader.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o MapElement.o ../src/libUnuk/LevelGen/MapElement.cpp
+
 ####### Install
 
 install:   FORCE
diff --git a/Unuk-QT/Unuk-QT b/Unuk-QT/Unuk-QT
deleted file mode 100755
index 84ea0f6..0000000
Binary files a/Unuk-QT/Unuk-QT and /dev/null differ
diff --git a/Unuk-QT/Unuk-QT.pro b/Unuk-QT/Unuk-QT.pro
index 0d848af..aeec6a8 100644
--- a/Unuk-QT/Unuk-QT.pro
+++ b/Unuk-QT/Unuk-QT.pro
@@ -16,10 +16,6 @@ HEADERS += ../src/Libs/wglext.h \
     ../src/libUnuk/Engine/Character.h \
     ../src/libUnuk/Engine/AStarBase.h \
     ../src/libUnuk/Engine/AStar.h \
-    ../src/libUnuk/Map/MapTile.h \
-    ../src/libUnuk/Map/MapEntities.h \
-    ../src/libUnuk/Map/MapElement.h \
-    ../src/libUnuk/Map/Map.h \
     ../src/libUnuk/Sprite/TextureManager.h \
     ../src/libUnuk/Sprite/Texture.h \
     ../src/libUnuk/Sprite/ImageLoader.h \
@@ -29,17 +25,21 @@ HEADERS += ../src/Libs/wglext.h \
     ../src/libUnuk/System/FPS.h \
     ../src/libUnuk/System/Debug.h \
     ../src/libUnuk/System/Timer.h \
-		../src/libUnuk/UI/MainMenu.h \
-		../src/libUnuk/UI/IngameMenu.h \
-		../src/libUnuk/UI/Font.h \
-		../src/libUnuk/UI/ButtonToggle.h \
-		../src/libUnuk/UI/ButtonGroup.h \
-		../src/libUnuk/UI/Button.h \
-		../src/libUnuk/UI/Text.h \
+    ../src/libUnuk/UI/MainMenu.h \
+    ../src/libUnuk/UI/IngameMenu.h \
+    ../src/libUnuk/UI/Font.h \
+    ../src/libUnuk/UI/ButtonToggle.h \
+    ../src/libUnuk/UI/ButtonGroup.h \
+    ../src/libUnuk/UI/Button.h \
+    ../src/libUnuk/UI/Text.h \
     ../src/Unuk/Globals.h \
     ../src/Unuk/Game.h \
     ../src/Unuk/Constants.h \
-    ../src/Unuk/Player.h
+    ../src/Unuk/Player.h \
+    ../src/libUnuk/LevelGen/LevelGen.h \
+    ../src/libUnuk/LevelGen/MapEntities.h \
+    ../src/libUnuk/LevelGen/MapElement.h \
+    ../src/libUnuk/LevelGen/MapTile.h
 SOURCES += ../src/libUnuk/Engine/WorldManager.cpp \
     ../src/libUnuk/Engine/ParticleEmitter.cpp \
     ../src/libUnuk/Engine/NPC.cpp \
@@ -47,9 +47,6 @@ SOURCES += ../src/libUnuk/Engine/WorldManager.cpp \
     ../src/libUnuk/Engine/Collision.cpp \
     ../src/libUnuk/Engine/Character.cpp \
     ../src/libUnuk/Engine/AStar.cpp \
-    ../src/libUnuk/Map/MapEntities.cpp \
-    ../src/libUnuk/Map/MapElement.cpp \
-    ../src/libUnuk/Map/Map.cpp \
     ../src/libUnuk/Sprite/TextureManager.cpp \
     ../src/libUnuk/Sprite/Texture.cpp \
     ../src/libUnuk/Sprite/ImageLoader.cpp \
@@ -59,15 +56,18 @@ SOURCES += ../src/libUnuk/Engine/WorldManager.cpp \
     ../src/libUnuk/System/Input.cpp \
     ../src/libUnuk/System/FPS.cpp \
     ../src/libUnuk/System/Debug.cpp \
-		../src/libUnuk/UI/Text.cpp \
-		../src/libUnuk/UI/MainMenu.cpp \
-		../src/libUnuk/UI/IngameMenu.cpp \
-		../src/libUnuk/UI/Font.cpp \
-		../src/libUnuk/UI/ButtonToggle.cpp \
-		../src/libUnuk/UI/ButtonGroup.cpp \
-		../src/libUnuk/UI/Button.cpp \
+    ../src/libUnuk/UI/Text.cpp \
+    ../src/libUnuk/UI/MainMenu.cpp \
+    ../src/libUnuk/UI/IngameMenu.cpp \
+    ../src/libUnuk/UI/Font.cpp \
+    ../src/libUnuk/UI/ButtonToggle.cpp \
+    ../src/libUnuk/UI/ButtonGroup.cpp \
+    ../src/libUnuk/UI/Button.cpp \
     ../src/Unuk/Player.cpp \
     ../src/Unuk/main.cpp \
     ../src/Unuk/Globals.cpp \
-    ../src/Unuk/Game.cpp
+    ../src/Unuk/Game.cpp \
+    ../src/libUnuk/LevelGen/LevelGen.cpp \
+    ../src/libUnuk/LevelGen/MapEntities.cpp \
+    ../src/libUnuk/LevelGen/MapElement.cpp
 OTHER_FILES += 
diff --git a/Win32/Unuk/LibUnuk/LibUnuk.vcproj b/Win32/Unuk/LibUnuk/LibUnuk.vcproj
index 489efd4..b21ebea 100644
--- a/Win32/Unuk/LibUnuk/LibUnuk.vcproj
+++ b/Win32/Unuk/LibUnuk/LibUnuk.vcproj
@@ -214,34 +214,34 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Map"
+			Name="LevelGen"
 			>
 			<File
-				RelativePath="..\..\..\src\libUnuk\Map\Map.cpp"
+				RelativePath="..\..\..\src\libUnuk\LevelGen\LevelGen.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\libUnuk\Map\Map.h"
+				RelativePath="..\..\..\src\libUnuk\LevelGen\LevelGen.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\libUnuk\Map\MapElement.cpp"
+				RelativePath="..\..\..\src\libUnuk\LevelGen\MapElement.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\libUnuk\Map\MapElement.h"
+				RelativePath="..\..\..\src\libUnuk\LevelGen\MapElement.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\libUnuk\Map\MapEntities.cpp"
+				RelativePath="..\..\..\src\libUnuk\LevelGen\MapEntities.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\libUnuk\Map\MapEntities.h"
+				RelativePath="..\..\..\src\libUnuk\LevelGen\MapEntities.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\libUnuk\Map\MapTile.h"
+				RelativePath="..\..\..\src\libUnuk\LevelGen\MapTile.h"
 				>
 			</File>
 		</Filter>
diff --git a/src/Unuk/Game.cpp b/src/Unuk/Game.cpp
index 4b18f39..d5d2526 100644
--- a/src/Unuk/Game.cpp
+++ b/src/Unuk/Game.cpp
@@ -17,7 +17,7 @@ Game::~Game(void) {
 
 gameNavVal_t Game::Run(const string savegameIDArg) {
   _player->SetXY(50, 50);
-  _player->LoadSprites("../Data/Media/Images/Characters/template.png", 40, 45);
+	_player->LoadSprites("../Data/Media/Images/Characters/Player.png", 40, 45);
 
   LoadSavegame(savegameIDArg);
 
@@ -46,7 +46,7 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
 
   stringstream npcHealth;
   _npcHealth.SetXY(10, 110);
-  _npcHealth.SetTextBlended("NPC 0 Health - XX", vsmall, COLOUR_BLACK);
+	_npcHealth.SetTextBlended("NPC X Health - XX", vsmall, COLOUR_BLACK);
 
   _healthBarBg.SetRGB(0, 0, 0);
   _healthBarBg.SetXY(10, 20);
diff --git a/src/Unuk/Game.h b/src/Unuk/Game.h
index d0c7172..723ab21 100644
--- a/src/Unuk/Game.h
+++ b/src/Unuk/Game.h
@@ -11,7 +11,7 @@
 #include "Globals.h"
 #include "Player.h"
 #include "../libUnuk/UI/IngameMenu.h"
-#include "../libUnuk/Map/Map.h"
+#include "../libUnuk/LevelGen/LevelGen.h"
 #include "../libUnuk/System/Timer.h"
 #include "../libUnuk/System/Debug.h"
 #include "../libUnuk/UI/Text.h"
@@ -36,7 +36,7 @@ private:
   void LoadSavegame(const string savegameIDArg);
   void SaveSavegame(void);
 
-  static const int MAX_FPS = 200;
+	static const int MAX_FPS = 200;
   static const int GAME_UPDATES_PER_SECOND = 60;
   static const int SKIP_TICKS = 1000 / GAME_UPDATES_PER_SECOND;
 
@@ -53,7 +53,7 @@ private:
   Text _npcHealth;
 
   IngameMenu _ingameMenu;
-  Map _map;
+	LevelGen _map;
 
   Player* _player;
 
diff --git a/src/Unuk/Player.cpp b/src/Unuk/Player.cpp
index 2f9a99b..f489cd1 100644
--- a/src/Unuk/Player.cpp
+++ b/src/Unuk/Player.cpp
@@ -3,7 +3,7 @@
 // Pixels * 60 / sec.
 const float Player::PLAYER_SPEED = Character::CHARACTER_SPEED + 0.5f;
 
-Player::Player(Map *mapArg) : Character(mapArg) {
+Player::Player(LevelGen *mapArg) : Character(mapArg) {
 
 }
 
diff --git a/src/Unuk/Player.h b/src/Unuk/Player.h
index 5cd1148..f2fe62c 100644
--- a/src/Unuk/Player.h
+++ b/src/Unuk/Player.h
@@ -8,7 +8,7 @@
 
 class Player : public Character {
 public:
-  Player(Map* mapArg);
+  Player(LevelGen* mapArg);
   ~Player(void);
 
   void HandleInput(void);
diff --git a/src/libUnuk/Engine/Character.cpp b/src/libUnuk/Engine/Character.cpp
index 07271fe..8892a12 100644
--- a/src/libUnuk/Engine/Character.cpp
+++ b/src/libUnuk/Engine/Character.cpp
@@ -6,7 +6,7 @@ const float Character::CHARACTER_SPEED = 3.5f;
 static list<Character*>collisionList;
 static list<Character*>::iterator collisionIter;
 
-Character::Character(Map* mapArg) {
+Character::Character(LevelGen* mapArg) {
   map = mapArg;
   attacking = false;
   directionFacing = FACING_DOWN;
diff --git a/src/libUnuk/Engine/Character.h b/src/libUnuk/Engine/Character.h
index 2ff2c8c..965bc6f 100644
--- a/src/libUnuk/Engine/Character.h
+++ b/src/libUnuk/Engine/Character.h
@@ -9,17 +9,17 @@
 #include "../Sprite/ApplySurface.h"
 #include "../Sprite/ImageLoader.h"
 #include "../Engine/Collision.h"
-#include "../Map/Map.h"
+#include "../LevelGen/LevelGen.h"
 #include "../System/Timer.h"
 #include "../UI/Text.h"
 #include "../System/Debug.h"
 using namespace std;
 
-class Map;
+class LevelGen;
 
 class Character {
 public:
-  Character(Map* mapArg);
+	Character(LevelGen* mapArg);
   ~Character(void);
 
   void LoadSprites(string filename, int wArg, int hArg);
@@ -88,7 +88,7 @@ protected:
 
   int _health;
   
-  Map* map;
+	LevelGen* map;
   
   static const float CHARACTER_SPEED;
   
diff --git a/src/libUnuk/Engine/NPC.cpp b/src/libUnuk/Engine/NPC.cpp
index 37fa4d7..9c4a560 100644
--- a/src/libUnuk/Engine/NPC.cpp
+++ b/src/libUnuk/Engine/NPC.cpp
@@ -1,6 +1,6 @@
 #include "NPC.h"
 
-NPC::NPC(Map* mapArg) : Character(mapArg) {
+NPC::NPC(LevelGen* mapArg) : Character(mapArg) {
   _moveTimer.Start();
   
   _moveChangeFrequency = 14000;
diff --git a/src/libUnuk/Engine/NPC.h b/src/libUnuk/Engine/NPC.h
index 5774690..0174a51 100644
--- a/src/libUnuk/Engine/NPC.h
+++ b/src/libUnuk/Engine/NPC.h
@@ -5,7 +5,7 @@
 
 class NPC : public Character {
 public:
-  NPC(Map* mapArg);
+  NPC(LevelGen* mapArg);
   ~NPC(void);
   
   void Update(void);
diff --git a/src/libUnuk/Map/Map.cpp b/src/libUnuk/LevelGen/LevelGen.cpp
similarity index 87%
rename from src/libUnuk/Map/Map.cpp
rename to src/libUnuk/LevelGen/LevelGen.cpp
index d3952c8..82ebb2f 100644
--- a/src/libUnuk/Map/Map.cpp
+++ b/src/libUnuk/LevelGen/LevelGen.cpp
@@ -1,15 +1,15 @@
-#include "Map.h"
+#include "LevelGen.h"
 #include "../Engine/NPC.h"
 
-Map::Map(void) {
+LevelGen::LevelGen(void) {
 
 }
 
-Map::~Map(void) {
+LevelGen::~LevelGen(void) {
 
 }
 
-void Map::Load(const string filename) {
+void LevelGen::Load(const string filename) {
   Unload();
   _currentMap = filename;
   string fullMapPath = "../Data/Media/Maps/" + filename;
@@ -18,7 +18,7 @@ void Map::Load(const string filename) {
   assert(mapFile.LoadFile() == true);
 
   // Getting dirty with some XML. This seems like a nicer
-  // approach to loading maps, rather than parsing tet files.
+	// approach to loading maps, rather than parsing text files.
   TiXmlElement* rootElem = NULL;
   TiXmlElement* lineElem = NULL;
   TiXmlElement* tileElem = NULL;
@@ -145,12 +145,12 @@ void Map::Load(const string filename) {
   _world.AddNPC(npc);
 }
 
-void Map::Update(void) {
+void LevelGen::Update(void) {
   _world.Update();
   // Update the map so we can render when camera moves.
 }
 
-void Map::Render(void) {
+void LevelGen::Render(void) {
   int xOrig = (camera.x / TILE_WIDTH) - 1;
   int yOrig = (camera.y / TILE_HEIGHT) - 1;
 
@@ -189,28 +189,28 @@ void Map::Render(void) {
   _world.Render();
 }
 
-void Map::Unload(void) {
+void LevelGen::Unload(void) {
   _tileTextures.Unload();
   _entityTextures.Unload();
 }
 
-string Map::GetCurrentMap(void) {
+string LevelGen::GetCurrentMap(void) {
   return _currentMap;
 }
 
-bool Map::GetTileSolidity(int xArg, int yArg) {
+bool LevelGen::GetTileSolidity(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetTileSolidity();
 }
 
-int Map::GetTileX(int xArg, int yArg) {
+int LevelGen::GetTileX(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetTileX();
 }
 
-int Map::GetTileY(int xArg, int yArg) {
+int LevelGen::GetTileY(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetTileY();
 }
 
-bool Map::GetEntitySolidity(int xArg, int yArg) {
+bool LevelGen::GetEntitySolidity(int xArg, int yArg) {
   if(xArg > x || yArg > y || yArg < 0 || yArg < 0) {
     return false;
   }
@@ -218,34 +218,34 @@ bool Map::GetEntitySolidity(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetEntitySolitity();
 }
 
-int Map::GetEntityX(int xArg, int yArg) {
+int LevelGen::GetEntityX(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetEntityX();
 }
 
-int Map::GetEntityY(int xArg, int yArg) {
+int LevelGen::GetEntityY(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetEntityY();
 }
 
-int Map::GetEntityWidth(int xArg, int yArg) {
+int LevelGen::GetEntityWidth(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetEntityWidth();
 }
 
-int Map::GetEntityHeight(int xArg, int yArg) {
+int LevelGen::GetEntityHeight(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetEntityHeight();
 }
 
-int Map::GetTileZLevel(int xArg, int yArg) {
+int LevelGen::GetTileZLevel(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetZLevel();
 }
 
-string Map::GetMapTransitionName(int xArg, int yArg) {
+string LevelGen::GetMapTransitionName(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetMapTransitionName();
 }
 
-int Map::GetMapTransitionX(int xArg, int yArg) {
+int LevelGen::GetMapTransitionX(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetMapTransitionX();
 }
 
-int Map::GetMapTransitionY(int xArg, int yArg) {
+int LevelGen::GetMapTransitionY(int xArg, int yArg) {
   return _tile[xArg + 1][yArg + 1].GetMapTransitionY();
 }
diff --git a/src/libUnuk/Map/Map.h b/src/libUnuk/LevelGen/LevelGen.h
similarity index 51%
rename from src/libUnuk/Map/Map.h
rename to src/libUnuk/LevelGen/LevelGen.h
index 0d6a5cc..f58b228 100644
--- a/src/libUnuk/Map/Map.h
+++ b/src/libUnuk/LevelGen/LevelGen.h
@@ -11,41 +11,39 @@
 #include "../../Unuk/Constants.h"
 #include "../Sprite/ImageLoader.h"
 #include "../Sprite/ApplySurface.h"
-#include "../Map/MapTile.h"
+#include "../LevelGen/MapTile.h"
 #include "../System/Debug.h"
 #include "../Engine/WorldManager.h"
 using namespace std;
 
-//class CharacterManager;
-
-class Map {
+class LevelGen {
 public:
-  Map(void);
-  ~Map(void);
+	LevelGen(void);
+	~LevelGen(void);
 
   void Load(const string filename);
   void Update(void);
   void Render(void);
 
-  bool GetTileSolidity(int xArg, int yArg);
-  int  GetTileX(int xArg, int yArg);
-  int  GetTileY(int xArg, int yArg);
+	bool GetTileSolidity(int xArg, int yArg);
+	int  GetTileX(int xArg, int yArg);
+	int  GetTileY(int xArg, int yArg);
 
-  bool GetEntitySolidity(int xArg, int yArg);
-  int  GetEntityX(int xArg, int yArg);
-  int  GetEntityY(int xArg, int yArg);
-  int  GetEntityWidth(int xArg, int yArg);
-  int  GetEntityHeight(int xArg, int yArg);
+	bool GetEntitySolidity(int xArg, int yArg);
+	int  GetEntityX(int xArg, int yArg);
+	int  GetEntityY(int xArg, int yArg);
+	int  GetEntityWidth(int xArg, int yArg);
+	int  GetEntityHeight(int xArg, int yArg);
 
-  int  GetTileZLevel(int xArg, int yArg);
+	int  GetTileZLevel(int xArg, int yArg);
 
-  string GetMapTransitionName(int xArg, int yArg);
-  int    GetMapTransitionX(int xArg, int yArg);
-  int    GetMapTransitionY(int xArg, int yArg);
+	string GetMapTransitionName(int xArg, int yArg);
+	int    GetMapTransitionX(int xArg, int yArg);
+	int    GetMapTransitionY(int xArg, int yArg);
 
-  string GetCurrentMap(void);
+	string GetCurrentMap(void);
 
-  WorldManager& GetWorld(void) { return _world; }
+	WorldManager& GetWorld(void) { return _world; }
 
 private:
   void Unload(void);
diff --git a/src/libUnuk/Map/Makefile b/src/libUnuk/LevelGen/Makefile
similarity index 100%
rename from src/libUnuk/Map/Makefile
rename to src/libUnuk/LevelGen/Makefile
diff --git a/src/libUnuk/Map/MapElement.cpp b/src/libUnuk/LevelGen/MapElement.cpp
similarity index 100%
rename from src/libUnuk/Map/MapElement.cpp
rename to src/libUnuk/LevelGen/MapElement.cpp
diff --git a/src/libUnuk/Map/MapElement.h b/src/libUnuk/LevelGen/MapElement.h
similarity index 100%
rename from src/libUnuk/Map/MapElement.h
rename to src/libUnuk/LevelGen/MapElement.h
diff --git a/src/libUnuk/Map/MapEntities.cpp b/src/libUnuk/LevelGen/MapEntities.cpp
similarity index 100%
rename from src/libUnuk/Map/MapEntities.cpp
rename to src/libUnuk/LevelGen/MapEntities.cpp
diff --git a/src/libUnuk/Map/MapEntities.h b/src/libUnuk/LevelGen/MapEntities.h
similarity index 100%
rename from src/libUnuk/Map/MapEntities.h
rename to src/libUnuk/LevelGen/MapEntities.h
diff --git a/src/libUnuk/Map/MapTile.h b/src/libUnuk/LevelGen/MapTile.h
similarity index 95%
rename from src/libUnuk/Map/MapTile.h
rename to src/libUnuk/LevelGen/MapTile.h
index e32ed8d..dfde0d9 100644
--- a/src/libUnuk/Map/MapTile.h
+++ b/src/libUnuk/LevelGen/MapTile.h
@@ -5,8 +5,8 @@
 
 #include "../../Unuk/Constants.h"
 #include "../Sprite/ApplySurface.h"
-#include "../Map/MapElement.h"
-#include "../Map/MapEntities.h"
+#include "../LevelGen/MapElement.h"
+#include "../LevelGen/MapEntities.h"
 using namespace std;
 
 class MapTile {
diff --git a/src/libUnuk/UI/MainMenu.h b/src/libUnuk/UI/MainMenu.h
index a59bb9d..39be779 100644
--- a/src/libUnuk/UI/MainMenu.h
+++ b/src/libUnuk/UI/MainMenu.h
@@ -3,7 +3,7 @@
 #include "../../Unuk/Constants.h"
 #include "../System/FPS.h"
 #include "../UI/ButtonGroup.h"
-#include "../Map/Map.h"
+#include "../LevelGen/LevelGen.h"
 #include "../System/Rect.h"
 #include "../UI/Text.h"
 
@@ -24,7 +24,7 @@ public:
 private:
   void Render(void);
 
-  Map _background;
+	LevelGen _background;
 
   Text lblMenu;