diff --git a/.gitignore b/.gitignore
index bf5a098..24cc19a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 #Directories
 Release/
 Debug/
-client/rsc/
+Out/
 
 #Project generated files
 *.db
diff --git a/client/makefile b/client/makefile
index 9bda937..d6ea347 100644
--- a/client/makefile
+++ b/client/makefile
@@ -1,20 +1,38 @@
+#config
 CXXFLAGS+=-std=c++11 -DDEBUG
 LIB=-lmingw32 -lSDL_net -lSDLmain -lSDL -lwsock32 -liphlpapi
-OBJ=base_scene.o scene_manager.o main.o surface_manager.o image.o sprite_sheet.o player.o
+
+#objects
+OBJDIR=obj
+OBJ=$(addprefix $(OBJDIR)/,base_scene.o scene_manager.o main.o surface_manager.o image.o sprite_sheet.o player.o)
+
+#output
+OUTDIR=out
+OUT=$(addprefix $(OUTDIR)/,a)
+
+#source
 SRC=test_systems.cpp in_game.cpp
 
-all: debug
+#targets
+all: $(OBJ) $(OUT)
+	$(CXX) $(CXXFLAGS) -o $(OUT) $(SRC) $(OBJ) $(LIB)
 
-release: $(OBJ)
-	$(CXX) $(CXXFLAGS) $(SRC) $(OBJ) $(LIB)
+$(OBJ): | $(OBJDIR)
 
-debug: $(OBJ)
-	$(CXX) $(CXXFLAGS) $(SRC) $(OBJ) $(LIB)
+$(OUT): | $(OUTDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c -o $(@) $<
 
 clean:
-	-$(RM) *.o *.a *.exe
+	$(RM) *.o *.a *.exe
 
 rebuild: clean all
 
 unit:
-	$(CXX) $(CXXFLAGS) unit.cpp surface_manager.cpp image.cpp sprite_sheet.cpp player.cpp -lmingw32 -lSDLmain -lSDL