diff --git a/Makefile.conf b/Makefile.conf
index 841c4a7..6eeb86b 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -2,37 +2,14 @@
 # Makefile.conf
 #
 
-LFLAGS += -lMySQL -lmysqlclient -lmysqlcppconn
-LFLAGS += -L$(ROOTPATH)/Libraries/MySQL/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/MySQL/include
-
-LFLAGS += -lSQLite -lsqlite3
-LFLAGS += -L$(ROOTPATH)/Libraries/SQLite/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/SQLite/include
-
-LFLAGS += -lDataStorage
-LFLAGS += -L$(ROOTPATH)/Libraries/DataStorage/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/DataStorage/include
-
-LFLAGS += -lTimer
-LFLAGS += -L$(ROOTPATH)/Libraries/Timer/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Timer/include
-
-LFLAGS += -lHttp -lcrypto -lcurl -lssl -lz
-LFLAGS += -L$(ROOTPATH)/Libraries/Http/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Http/include
-
-LFLAGS += -lLogging
-LFLAGS += -L$(ROOTPATH)/Libraries/Logging/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Logging/include
-
-LFLAGS += -lUtilities
-LFLAGS += -L$(ROOTPATH)/Libraries/Utilities/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Utilities/include
-
-LFLAGS += -lDateTime
-LFLAGS += -L$(ROOTPATH)/Libraries/DateTime/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/DateTime/include
+LIBRARIES += MySQL
+LIBRARIES += SQLite
+LIBRARIES += Http
+LIBRARIES += DataStorage
+LIBRARIES += Timer
+LIBRARIES += Logging
+LIBRARIES += Utilities
+LIBRARIES += DateTime
 
 CFLAGS += -I$(ROOTPATH)/Libraries/clipp/include
 CFLAGS += -I$(ROOTPATH)/Libraries/inih
@@ -43,3 +20,8 @@ LFLAGS += -pthread
 CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/Libraries
 
 DEBUGDIR := .debug
+
+TARGETS += DataStorageAPI
+TARGETS += DataCondenser
+TARGETS += DataImporter
+
diff --git a/Makefile.target b/Makefile.target
deleted file mode 100644
index 0b230ac..0000000
--- a/Makefile.target
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Makefile.target
-#
-
-DataStorageAPI.$(ARCH): $(OBJECTS) Application/DataStorageAPI.o.$(ARCH)
-	$(call build_target_arch,$@,$^)
-
-DataCondenser.$(ARCH): $(OBJECTS) Application/DataCondenser.o.$(ARCH)
-	$(call build_target_arch,$@,$^)
-
-DataImporter.$(ARCH): $(OBJECTS) Application/DataImporter.o.$(ARCH)
-	$(call build_target_arch,$@,$^)
-
-DataStorageAPI:
-	$(call build_target,$@)
-
-DataCondenser:
-	$(call build_target,$@)
-
-DataImporter:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := DataStorageAPI
-
-TARGETS += DataStorageAPI DataCondenser DataImporter
diff --git a/Makefiles b/Makefiles
index 5e11355..5afd04e 160000
--- a/Makefiles
+++ b/Makefiles
@@ -1 +1 @@
-Subproject commit 5e113555ebd4e049b287b3c94c4ef33e151ea4e6
+Subproject commit 5afd04e99bb8e0d186b928aadb5029d4deb4357b