--- a/config.mak	Mon Oct 03 08:51:31 2016 +0300
+++ b/config.mak	Mon Oct 03 09:20:32 2016 +0300
@@ -1,7 +1,9 @@
 # Additional binaries (aka the demo)
 DEMO_BIN=krapula
-DEMO_OBJS=krapula.o dmsimple.o
-BINARIES=$(DEMO_BIN)
+DEMO_OBJS=demo.o dmsimple.o
+
+TOOL_BINPATH=bin/
+TESTS_BINPATH=$(TOOL_BINPATH)
 
 # Build engine tests and tools? (Please notice that what
 # actually gets built it also affected by other options)
@@ -29,7 +31,6 @@
 DM_USE_STDIO=no
 DM_USE_MEMIO=no
 
-
 DM_GFX_BM_TEXT=yes
 DM_GFX_TTF_TEXT=no
 DM_GFX_LINES=no
@@ -46,7 +47,7 @@
 JSS=yes
 
 # Build a special "light"/minimized version by removing all
-# error messages and few other things.
+# error messages and few other things. (disabled by DM_DEBUG=yes)
 JSS_LIGHT=yes
 
 # Build with extra debugging code? (disabled by JSS_LIGHT=yes)
@@ -83,5 +84,3 @@
 ### Locking/thread support
 ###
 JSS_SUP_THREADS=yes
-
-