diff --git a/confparser/Makefile b/confparser/Makefile
deleted file mode 100755
index 98f1f52..0000000
--- a/confparser/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-include Makefile.o.dep
-
-
-all: $(o)
-
-
-.SUFFIXES: .cpp .o
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $<
-
-
-
-depend:
-	makedepend -Y. -I.. -I../../ezc/src -f- *.cpp > Makefile.dep
-	echo -n "o = " > Makefile.o.dep
-	ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep
-
-clean:
-	rm -f *.o
-
-include Makefile.dep
diff --git a/confparser/Makefile.dep b/confparser/Makefile.dep
deleted file mode 100755
index 3755e78..0000000
--- a/confparser/Makefile.dep
+++ /dev/null
@@ -1 +0,0 @@
-# DO NOT DELETE
diff --git a/confparser/Makefile.o.dep b/confparser/Makefile.o.dep
deleted file mode 100755
index b6628d8..0000000
--- a/confparser/Makefile.o.dep
+++ /dev/null
@@ -1 +0,0 @@
-o = 
\ No newline at end of file
diff --git a/core/db.cpp b/db/db.cpp
similarity index 100%
rename from core/db.cpp
rename to db/db.cpp
diff --git a/core/db.h b/db/db.h
similarity index 100%
rename from core/db.h
rename to db/db.h
diff --git a/core/db_itemcolumns.cpp b/db/db_itemcolumns.cpp
similarity index 100%
rename from core/db_itemcolumns.cpp
rename to db/db_itemcolumns.cpp