diff --git a/Bin/Makefile b/Bin/Makefile
index 93d1d7c..bb53e79 100644
--- a/Bin/Makefile
+++ b/Bin/Makefile
@@ -8,18 +8,37 @@ LDADDSTATIC = -Wl,-Bstatic -lSDL -lSDL_image -lopenal -lalut -L/usr/X11 -Wl,-Bdy
 default: all
 
 all:
-	$(MAKE) -C ../src/libUnuk
+	$(MAKE) -C ../src/libUnuk/Engine
+	$(MAKE) -C ../src/libUnuk/Map
+	$(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/*.o ../src/Unuk/*.o $(LDADD)
+	
+	$(CC) $(CFLAGS) -o Unuk ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ../src/libUnuk/Map/*.o \
+                          ../src/libUnuk/Sprite/*.o ../src/libUnuk/System/*.o ../src/libUnuk/Ui/*.o \
+                          ../src/Unuk/*.o $(LDADD)
 
 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
+	$(MAKE) -C ../src/libUnuk/Engine
+	$(MAKE) -C ../src/libUnuk/Map
+	$(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/*.o ../src/Unuk/*.o $(LDADDSTATIC)
+	
+	$(CC) $(CFLAGS) -o build/Unuk-static ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ..src/libUnuk/Map/*.o \
+                                       ../src/libUnuk/Sprite/*.o ../src/libUnuk/System/*.o ../src/libUnuk/Ui/*.o \
+                                       ../src/Unuk/*.o $(LDADDSTATIC)
 
 clean:
-	$(MAKE) -C ../src/libUnuk clean
-	$(MAKE) -C ../src/Unuk clean
+	$(MAKE) -C ../src/libUnuk/Engine       clean
+	$(MAKE) -C ../src/libUnuk/Map          clean
+	$(MAKE) -C ../src/libUnuk/Sprite       clean
+	$(MAKE) -C ../src/libUnuk/System       clean
+	$(MAKE) -C ../src/libUnuk/Ui           clean
+	$(MAKE) -C ../src/Unuk                 clean
 	rm -f Unuk Debug.log ../Data/Debug.log ../Unuk-QT/Unuk-QT
+
diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile
index 74dae28..588039e 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: Fri Jan 13 23:26:53 2012
+# Generated by qmake (2.01a) (Qt 4.7.3) on: Sat Jan 14 02:35:09 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
diff --git a/Unuk-QT/Unuk-QT.pro b/Unuk-QT/Unuk-QT.pro
index be4aec7..e0c4e32 100644
--- a/Unuk-QT/Unuk-QT.pro
+++ b/Unuk-QT/Unuk-QT.pro
@@ -70,4 +70,4 @@ SOURCES += ../src/libUnuk/Engine/WorldManager.cpp \
     ../src/Unuk/main.cpp \
     ../src/Unuk/Globals.cpp \
     ../src/Unuk/Game.cpp
-OTHER_FILES += ../src/Unuk/Makefile
+OTHER_FILES += 
diff --git a/src/libUnuk/Engine/Makefile b/src/libUnuk/Engine/Makefile
new file mode 100644
index 0000000..37f563d
--- /dev/null
+++ b/src/libUnuk/Engine/Makefile
@@ -0,0 +1,19 @@
+CC = g++
+CFLAGS = -ansi -Wall -g
+LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
+objects = Character.o Collision.o WorldManager.o NPC.o ParticleEmitter.o \
+	          AStar.o MemManager.o \
+
+.PHONY: default all clean
+
+default: all
+
+%.cpp: %.h
+
+%.o: %.cpp
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+all: $(objects)
+
+clean:
+	rm -f $(objects)
diff --git a/src/libUnuk/Makefile b/src/libUnuk/Makefile
deleted file mode 100644
index 2a9af10..0000000
--- a/src/libUnuk/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-CC = g++
-CFLAGS = -ansi -Wall -g
-LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
-objects = ApplySurface.o Button.o ButtonToggle.o ButtonGroup.o Character.o Collision.o \
-	    Debug.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o  \
-	    WorldManager.o Map.o MapElement.o MapEntities.o MemManager.o NPC.o ParticleEmitter.o \
-	    Rect.o Text.o Texture.o TextureManager.o Timer.o \
-        AStar.o \
-
-.PHONY: default all clean
-
-default: all
-
-%.cpp: %.h
-
-%.o: %.cpp
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-all: $(objects)
-
-clean:
-	rm -f $(objects)
diff --git a/src/libUnuk/Map/Makefile b/src/libUnuk/Map/Makefile
new file mode 100644
index 0000000..2c06db3
--- /dev/null
+++ b/src/libUnuk/Map/Makefile
@@ -0,0 +1,18 @@
+CC = g++
+CFLAGS = -ansi -Wall -g
+LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
+objects = Map.o MapElement.o MapEntities.o  \
+
+.PHONY: default all clean
+
+default: all
+
+%.cpp: %.h
+
+%.o: %.cpp
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+all: $(objects)
+
+clean:
+	rm -f $(objects)
diff --git a/src/libUnuk/Sprite/Makefile b/src/libUnuk/Sprite/Makefile
new file mode 100644
index 0000000..42d9056
--- /dev/null
+++ b/src/libUnuk/Sprite/Makefile
@@ -0,0 +1,18 @@
+CC = g++
+CFLAGS = -ansi -Wall -g
+LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
+objects = ApplySurface.o ImageLoader.o Texture.o TextureManager.o \
+
+.PHONY: default all clean
+
+default: all
+
+%.cpp: %.h
+
+%.o: %.cpp
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+all: $(objects)
+
+clean:
+	rm -f $(objects)
diff --git a/src/libUnuk/System/Makefile b/src/libUnuk/System/Makefile
new file mode 100644
index 0000000..92729d7
--- /dev/null
+++ b/src/libUnuk/System/Makefile
@@ -0,0 +1,18 @@
+CC = g++
+CFLAGS = -ansi -Wall -g
+LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
+objects = Debug.o FPS.o Input.o Rect.o Timer.o \
+
+.PHONY: default all clean
+
+default: all
+
+%.cpp: %.h
+
+%.o: %.cpp
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+all: $(objects)
+
+clean:
+	rm -f $(objects)
diff --git a/src/libUnuk/Ui/Makefile b/src/libUnuk/Ui/Makefile
new file mode 100644
index 0000000..0170c06
--- /dev/null
+++ b/src/libUnuk/Ui/Makefile
@@ -0,0 +1,19 @@
+CC = g++
+CFLAGS = -ansi -Wall -g
+LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
+objects = Button.o ButtonToggle.o ButtonGroup.o Font.o IngameMenu.o \
+            MainMenu.o Text.o \
+
+.PHONY: default all clean
+
+default: all
+
+%.cpp: %.h
+
+%.o: %.cpp
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+all: $(objects)
+
+clean:
+	rm -f $(objects)