diff --git a/src/Makefile b/Makefile
similarity index 99%
rename from src/Makefile
rename to Makefile
index bff27d8..c6c2cf4 100644
--- a/src/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ clean:
 
 .PHONY: fix
 fix:
-	@for i in *.c *.h Makefile ../mysql/create_tables ; do \
+	@for i in *.c *.h Makefile mysql/create_tables ; do \
 	    if grep -q -m 1 -E '\s+$$' $$i ; then \
 	        echo "FIX   $$i" ; \
 	        sed -i $$i -e 's/\s*$$//g' ; \
diff --git a/src/bee_getopt.c b/bee_getopt.c
similarity index 100%
rename from src/bee_getopt.c
rename to bee_getopt.c
diff --git a/src/bee_getopt.h b/bee_getopt.h
similarity index 100%
rename from src/bee_getopt.h
rename to bee_getopt.h
diff --git a/src/mx_flock.c b/mx_flock.c
similarity index 100%
rename from src/mx_flock.c
rename to mx_flock.c
diff --git a/src/mx_flock.h b/mx_flock.h
similarity index 100%
rename from src/mx_flock.h
rename to mx_flock.h
diff --git a/src/mx_util.c b/mx_util.c
similarity index 100%
rename from src/mx_util.c
rename to mx_util.c
diff --git a/src/mx_util.h b/mx_util.h
similarity index 100%
rename from src/mx_util.h
rename to mx_util.h
diff --git a/src/mxq.h b/mxq.h
similarity index 100%
rename from src/mxq.h
rename to mxq.h
diff --git a/src/mxq_exec.c b/mxq_exec.c
similarity index 100%
rename from src/mxq_exec.c
rename to mxq_exec.c
diff --git a/src/mxq_group.c b/mxq_group.c
similarity index 100%
rename from src/mxq_group.c
rename to mxq_group.c
diff --git a/src/mxq_group.h b/mxq_group.h
similarity index 100%
rename from src/mxq_group.h
rename to mxq_group.h
diff --git a/src/mxq_job.c b/mxq_job.c
similarity index 100%
rename from src/mxq_job.c
rename to mxq_job.c
diff --git a/src/mxq_job.h b/mxq_job.h
similarity index 100%
rename from src/mxq_job.h
rename to mxq_job.h
diff --git a/src/mxq_job_dump.c b/mxq_job_dump.c
similarity index 100%
rename from src/mxq_job_dump.c
rename to mxq_job_dump.c
diff --git a/src/mxq_list.c b/mxq_list.c
similarity index 100%
rename from src/mxq_list.c
rename to mxq_list.c
diff --git a/src/mxq_mysql.c b/mxq_mysql.c
similarity index 100%
rename from src/mxq_mysql.c
rename to mxq_mysql.c
diff --git a/src/mxq_mysql.h b/mxq_mysql.h
similarity index 100%
rename from src/mxq_mysql.h
rename to mxq_mysql.h
diff --git a/src/mxq_submit.c b/mxq_submit.c
similarity index 100%
rename from src/mxq_submit.c
rename to mxq_submit.c
diff --git a/src/mxq_util.c b/mxq_util.c
similarity index 100%
rename from src/mxq_util.c
rename to mxq_util.c
diff --git a/src/mxq_util.h b/mxq_util.h
similarity index 100%
rename from src/mxq_util.h
rename to mxq_util.h
diff --git a/src/mxqd.c b/mxqd.c
similarity index 100%
rename from src/mxqd.c
rename to mxqd.c
diff --git a/src/mxqd.h b/mxqd.h
similarity index 100%
rename from src/mxqd.h
rename to mxqd.h
diff --git a/src/mxqdump.c b/mxqdump.c
similarity index 100%
rename from src/mxqdump.c
rename to mxqdump.c
diff --git a/src/mxqsub.c b/mxqsub.c
similarity index 100%
rename from src/mxqsub.c
rename to mxqsub.c
diff --git a/src/test.c b/test.c
similarity index 100%
rename from src/test.c
rename to test.c
diff --git a/src/test_mx_util.c b/test_mx_util.c
similarity index 100%
rename from src/test_mx_util.c
rename to test_mx_util.c