diff --git a/Makefile.conf b/Makefile.conf
index 53df5d3..522fd60 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -2,16 +2,11 @@
 # Makefile.conf
 #
 
-LFLAGS += -lUtilities
-LFLAGS += -L$(ROOTPATH)/Libraries/Utilities/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Utilities/include
-
-LFLAGS += -lLogging
-LFLAGS += -L$(ROOTPATH)/Libraries/Logging/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Logging/include
-
-LFLAGS += -lMySQL -lmysqlclient -lmysqlcppconn
-LFLAGS += -L$(ROOTPATH)/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/include
+LIBRARIES += Logging
+LIBRARIES += Utilities
 
 DEBUGDIR := .debug
+
+TARGETS += MySQL.a
+TARGETS += test
+
diff --git a/Makefile.dep b/Makefile.dep
new file mode 100644
index 0000000..5402819
--- /dev/null
+++ b/Makefile.dep
@@ -0,0 +1,7 @@
+#
+# Makefile.dep
+#
+
+LFLAGS += -lMySQL
+LFLAGS += -lmysqlclient -lmysqlcppconn
+
diff --git a/Makefile.target b/Makefile.target
deleted file mode 100644
index bea52d0..0000000
--- a/Makefile.target
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile.target
-#
-
-MySQL.a.$(ARCH) : $(OBJECTS)
-	$(call build_target_library_arch,$@,$^)
-MySQL.a:
-	$(call build_target,$@)
-
-test.$(ARCH): $(OBJECTS) Test/Test.o.$(ARCH) | MySQL.a.$(ARCH)
-	$(call build_target_arch,$@,$^)
-test:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := MySQL.a
-
-TARGETS += MySQL.a test
diff --git a/Makefiles b/Makefiles
index cd9ef1a..5afd04e 160000
--- a/Makefiles
+++ b/Makefiles
@@ -1 +1 @@
-Subproject commit cd9ef1a1b0f7b88f36b0c51b4209d1859aca83aa
+Subproject commit 5afd04e99bb8e0d186b928aadb5029d4deb4357b