-CURDIR :=
-FILES := # insure blank
+NEWSRCS := # insure blank
-FILES += game.cpp
-FILES += main.cpp
-FILES += mathw.cpp
-FILES += ticks.cpp
-FILES += Vector2.cpp
-FILES += handleSignal.cpp
+NEWSRCS += game.cpp
+NEWSRCS += main.cpp
+NEWSRCS += handleSignal.cpp
-FILES += entityCreator.cpp
-FILES += entityManager.cpp
-FILES += effectManager.cpp
-FILES += collisionManager.cpp
-FILES += CollisionInfo.cpp
+NEWSRCS += entityCreator.cpp
+NEWSRCS += entityManager.cpp
+NEWSRCS += effectManager.cpp
+NEWSRCS += collisionManager.cpp
+NEWSRCS += CollisionInfo.cpp
-FILES += debug.cpp
-FILES := $(addprefix ${CURDIR},${FILES})
+NEWDIRS := # insure blank
-SRCS += ${FILES}
+NEWDIRS += Entities/
+NEWDIRS += GameStates/
+NEWDIRS += Effects/
+NEWDIRS += config/
+NEWDIRS += input/
+NEWDIRS += graphics/
+
+
+# Post dir setup
+
+CURDIR :=
+
+NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS})
+NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS})
+NEWOBJS := ${NEWSRCS:.cpp=.o}
+NEWDEPS := ${NEWSRCS:.cpp=.d}
+
+# Append to lists
+
+SRCS += ${NEWSRCS}
+DIRS += ${NEWDIRS}
+OBJS += $(addprefix ${OBJSDIR},${NEWOBJS})
+DEPS += $(addprefix ${DEPSDIR},${NEWDEPS})
+
+
+include $(addprefix ${SRCSDIR},$(addsuffix ${DIRMK},${NEWDIRS}))