--- a/Makefile.gen	Tue Apr 16 06:04:22 2013 +0300
+++ b/Makefile.gen	Tue Apr 16 06:18:02 2013 +0300
@@ -30,8 +30,11 @@
 
 EDITOR_PRO = editor.pro
 EDITOR_MAKEFILE = Makefile.editor
-EDITOR_SOURCES = edmain.cpp edgui.cpp edview.cpp edtlobj.cpp edtimeline.cpp edwaveform.cpp edres.cpp
-EDITOR_HEADERS = edmain.h edtlobj.h edview.h edtimeline.h edwaveform.h edres.h
+EDITOR_SOURCES = editor/edmain.cpp editor/edgui.cpp editor/edview.cpp \
+	editor/edtlobj.cpp editor/edtimeline.cpp editor/edwaveform.cpp \
+	editor/edres.cpp
+EDITOR_HEADERS = editor/edmain.h editor/edtlobj.h editor/edview.h \
+	editor/edtimeline.h editor/edwaveform.h editor/edres.h
 
 
 ###
@@ -122,7 +125,7 @@
 ifeq ($(DM_BUILD_TESTS),yes)
 ifeq ($(DM_GFX_BLITS),yes)
 ifeq ($(DM_USE_STDIO),yes)
-BINARIES += blittest vptest efu
+TESTS_BINARIES += blittest vptest efu
 endif
 endif
 endif
@@ -212,7 +215,8 @@
 ifeq ($(DM_USE_STDIO),yes)
 TOOL_BINARIES+= objlink data2inc gfxconv gentab
 ifeq ($(SUP_MODLOAD),yes)
-TOOL_BINARIES+= viewmod mod2wav testpl
+TOOL_BINARIES+= viewmod mod2wav
+TESTS_BINARIES+= testpl
 ifeq ($(DM_GFX_BLITS),yes)
 TOOL_BINARIES+= view64
 ifeq ($(DM_GFX_BM_TEXT),yes)
@@ -232,6 +236,14 @@
 DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
 endif
 
+ifeq ($(DM_BUILD_TESTS),yes)
+TESTS_BINARIES += vecmattest fptest
+endif
+
+FONTCONV_BIN=$(BINPATH)fontconv$(EXEEXT)
+DATA2INC_BIN=$(BINPATH)data2inc$(EXEEXT)
+
+
 ###
 ### Rest of the rules
 ###
@@ -243,35 +255,46 @@
 
 
 DMLIB_A=$(OBJPATH)dmlib.a
-DMLIB_OBJS += dmfile.o dmbstr.o dmlib.o dmlerp.o dmstring.o \
+DMLIB_OBJS += \
+	dmfile.o dmbstr.o dmlib.o dmlerp.o dmstring.o \
 	dmargs.o dmvecmat.o dmperlin.o dmimage.o \
-	dmwav.o	dmengine.o  dmq3d.o
+	dmwav.o	dmengine.o dmq3d.o
 
-ifeq ($(DM_BUILD_TESTS),yes)
-BINARIES += vecmattest fptest
-endif
 
-FONTCONV_BIN=$(BINPATH)fontconv$(EXEEXT)
-DATA2INC_BIN=$(BINPATH)data2inc$(EXEEXT)
-
+TESTS_TARGETS = $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(TESTS_BINARIES)))
 TOOL_TARGETS = $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES)))
-TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) $(TOOL_TARGETS)
+TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \
+	$(TOOL_TARGETS) $(TESTS_TARGETS)
 
 all: $(TARGETS)
 
 ###
 ### Generic rules
 ###
-$(OBJPATH)gtk%.o: $(DMLIB)gtk%.c $(DMLIB)gtk%.h
-	@echo " CC $+"
-	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(GTK_CFLAGS)
-
-
 $(OBJPATH)%.d: $(DMLIB)%.c
 	@echo > $@
 	@grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done
 
 
+$(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h
+	@echo " CC $<"
+	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
+
+$(OBJPATH)%.o: $(DMLIB)tests/%.c
+	@echo " CC $<"
+	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
+
+
+$(OBJPATH)%.o: $(DMLIB)tools/%.c $(DMLIB)tools/%.h
+	@echo " CC $<"
+	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
+
+$(OBJPATH)%.o: $(DMLIB)tools/%.c
+	@echo " CC $<"
+	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
+
+
+
 $(OBJPATH)%.o: $(DMLIB)%.c $(DMLIB)%.h
 	@echo " CC $<"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
@@ -375,6 +398,11 @@
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm
 
+$(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A)
+	@echo " LINK $+"
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
+
+
 $(BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
@@ -402,10 +430,6 @@
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
 
 
-$(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A)
-	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
-
 $(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)