diff --git a/Makefile b/Makefile
index 02103bbd..b80ef23f 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ SRCDIR_KERNAL  = $(SRCDIR_COMMON) \
 
 SRC_BASIC  = $(foreach dir,$(SRCDIR_BASIC),$(wildcard $(dir)/*.s))
 SRC_KERNAL = $(foreach dir,$(SRCDIR_KERNAL),$(wildcard $(dir)/*.s))
-SRC_TOOLS  = $(wildcard src/tools/*.c,src/tools/*.cc)
+SRC_TOOLS  = $(wildcard tools/*.c,tools/*.cc)
 
 # Generated files
 
@@ -80,7 +80,7 @@ TOOL_RELEASE            = build/tools/release
 TOOL_SIMILARITY         = build/tools/similarity
 TOOL_ASSEMBLER          = assembler/KickAss.jar
 
-TOOLS_LIST = $(pathsubst src/tools/%,build/tools/%,$(basename $(SRC_TOOLS)))
+TOOLS_LIST = $(pathsubst tools/%,build/tools/%,$(basename $(SRC_TOOLS)))
 
 # List of targets
 
@@ -131,19 +131,19 @@ updatebin:
 
 # Rules - tools
 
-$(TOOL_PNGPREPARE): src/pngprepare.c
+$(TOOL_PNGPREPARE): tools/pngprepare.c
 	@mkdir -p build/tools
 	$(CC) -O2 -Wall -I/usr/local/include -L/usr/local/lib -o $@ $< -lpng
 
-$(TOOL_COMPRESS_TEXT): src/compress_text.c
+$(TOOL_COMPRESS_TEXT): tools/compress_text.c
 	@mkdir -p build/tools
 	$(CC) -O2 -Wall -I/usr/local/include -L/usr/local/lib -o $@ $< -lm
 
-build/tools/%: src/%.c
+build/tools/%: tools/%.c
 	@mkdir -p build/tools
 	$(CC) -O2 -Wall -o $@ $<
 
-build/tools/%: src/%.cc src/common.h
+build/tools/%: tools/%.cc tools/common.h
 	@mkdir -p build/tools
 	$(CXX) -O2 -Wall -o $@ $<
 
diff --git a/src/build_segment.cc b/tools/build_segment.cc
similarity index 100%
rename from src/build_segment.cc
rename to tools/build_segment.cc
diff --git a/src/collect_data.c b/tools/collect_data.c
similarity index 100%
rename from src/collect_data.c
rename to tools/collect_data.c
diff --git a/src/common.h b/tools/common.h
similarity index 100%
rename from src/common.h
rename to tools/common.h
diff --git a/src/compress_text.c b/tools/compress_text.c
similarity index 100%
rename from src/compress_text.c
rename to tools/compress_text.c
diff --git a/src/generate_constants.cc b/tools/generate_constants.cc
similarity index 100%
rename from src/generate_constants.cc
rename to tools/generate_constants.cc
diff --git a/src/outdated/basic005.c b/tools/outdated/basic005.c
similarity index 100%
rename from src/outdated/basic005.c
rename to tools/outdated/basic005.c
diff --git a/src/outdated/prepare_startup.c b/tools/outdated/prepare_startup.c
similarity index 100%
rename from src/outdated/prepare_startup.c
rename to tools/outdated/prepare_startup.c
diff --git a/src/outdated/preprocess.c b/tools/outdated/preprocess.c
similarity index 100%
rename from src/outdated/preprocess.c
rename to tools/outdated/preprocess.c
diff --git a/src/pngprepare.c b/tools/pngprepare.c
similarity index 100%
rename from src/pngprepare.c
rename to tools/pngprepare.c
diff --git a/src/release.cc b/tools/release.cc
similarity index 100%
rename from src/release.cc
rename to tools/release.cc
diff --git a/src/similarity.c b/tools/similarity.c
similarity index 100%
rename from src/similarity.c
rename to tools/similarity.c