diff --git a/Makefile b/Makefile
index 3392899..ee20242 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,20 @@
-all: a2b b2d m2s
+all: a2b b2d m2s xpack
+
+clean:
+	rm a2b
+	rm b2d
+	rm m2s
+	rm xpack
 
 a2b:
-	cd a2fcbmp && $(MAKE)
+	cd src_a2b && $(MAKE)
 
 b2d:
-	cd src && $(MAKE)
+	cd src_b2d && $(MAKE)
 
 m2s:
-	echo "Missing sources!"
+	cd src_m2s && $(MAKE)
+
+xpack:
+	cd src_xpack && $(MAKE)
+
diff --git a/a2fcbmp/Makefile b/src_a2b/Makefile
similarity index 100%
rename from a2fcbmp/Makefile
rename to src_a2b/Makefile
diff --git a/a2fcbmp/MinGW Command Prompt.lnk b/src_a2b/MinGW Command Prompt.lnk
similarity index 100%
rename from a2fcbmp/MinGW Command Prompt.lnk
rename to src_a2b/MinGW Command Prompt.lnk
diff --git a/a2fcbmp/a2fcbmp.c b/src_a2b/a2fcbmp.c
similarity index 100%
rename from a2fcbmp/a2fcbmp.c
rename to src_a2b/a2fcbmp.c
diff --git a/src/Makefile b/src_b2d/Makefile
similarity index 100%
rename from src/Makefile
rename to src_b2d/Makefile
diff --git a/src/MinGW Command Prompt.lnk b/src_b2d/MinGW Command Prompt.lnk
similarity index 100%
rename from src/MinGW Command Prompt.lnk
rename to src_b2d/MinGW Command Prompt.lnk
diff --git a/src/b2d.c b/src_b2d/b2d.c
similarity index 100%
rename from src/b2d.c
rename to src_b2d/b2d.c
diff --git a/src/b2d.h b/src_b2d/b2d.h
similarity index 100%
rename from src/b2d.h
rename to src_b2d/b2d.h
diff --git a/src/tomthumb.h b/src_b2d/tomthumb.h
similarity index 100%
rename from src/tomthumb.h
rename to src_b2d/tomthumb.h
diff --git a/magick/Makefile b/src_m2s/Makefile
similarity index 100%
rename from magick/Makefile
rename to src_m2s/Makefile
diff --git a/magick/MinGW Command Prompt.lnk b/src_m2s/MinGW Command Prompt.lnk
similarity index 100%
rename from magick/MinGW Command Prompt.lnk
rename to src_m2s/MinGW Command Prompt.lnk
diff --git a/magick/m2s.c b/src_m2s/m2s.c
similarity index 100%
rename from magick/m2s.c
rename to src_m2s/m2s.c
diff --git a/xpack/Makefile b/src_xpack/Makefile
similarity index 100%
rename from xpack/Makefile
rename to src_xpack/Makefile
diff --git a/xpack/MinGW Command Prompt.lnk b/src_xpack/MinGW Command Prompt.lnk
similarity index 100%
rename from xpack/MinGW Command Prompt.lnk
rename to src_xpack/MinGW Command Prompt.lnk
diff --git a/xpack/xpack.c b/src_xpack/xpack.c
similarity index 100%
rename from xpack/xpack.c
rename to src_xpack/xpack.c