diff --git a/.gitignore b/.gitignore
index 772d03c..2bd9afa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,11 @@
 *.o
+*~
 
 qooxdoo-1.6-sdk/
 web/nhweb/build/
 website/
 
-GateKeeper
-INIReaderTest
 db/lib/CNHDBAccess.cpp
 db/lib/CNHDBAccess.h
 db/lib/CNHDBAccess.php
-db/lib/gen_dblib
-nh-irc
-nh-irc-misc
-nh-irccat
-nh-mail
-nh-matrix
-nh-monitor
-nh-temperature
-nh-test
-nh-test-irc
-nh-tts
-nh-vend
+
diff --git a/Makefile b/Makefile
index c104d26..fdb312f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,88 +1,63 @@
-all: nh-test INIReaderTest nh-irc GateKeeper nh-test-irc nh-irc-misc nh-irccat nh-monitor nh-matrix nh-temperature nh-vend nh-mail nh-tts db/lib/CNHDBAccess.php 
- 
-install: install_nh_holly install_gatekeeper
-
-install_gatekeeper: GateKeeper
-	stop GateKeeper
-	cp GateKeeper /home/instrumentation/bin/
-	chmod 555 /home/instrumentation/bin/GateKeeper
-	start GateKeeper
-
-install_nh_holly: nh-irc
-	stop nh-holly
-	cp nh-irc /home/instrumentation/bin/
-	chmod 555 /home/instrumentation/bin/nh-irc
-	start nh-holly
-
-install_irccat: nh-irccat
-	stop nh-irccat
-	cp nh-irccat /home/instrumentation/bin/
-	chmod 555 /home/instrumentation/nh-irccar
-	cp command_runner.py /home/instrumentation/bin/
-	chmod 555 /home/instrumentaion/bin/command_runner.py
-	cp -r irccat /home/instrumentation/bin/
-	chmod 755 /home/instrumentaion/bin/irccat
-	chmod 555 /home/instrumentaion/bin/irccat/*
-	start nh-irccat
-	
-install_upstart:
-	cp upstart/* /etc/init/
-	
-install_conf:
-	cp -r conf /home/instrumentaion/
-
-nh-test: nh-test.o CNHmqtt.o INIReader.o ini.o CLogging.o
-	g++ -lmosquitto -o nh-test nh-test.o CNHmqtt.o INIReader.o ini.o CLogging.o
-
-nh-tts: nh-tts.o CNHmqtt.o INIReader.o ini.o CLogging.o
-	g++ -lmosquitto -lpthread -o nh-tts nh-tts.o CNHmqtt.o INIReader.o ini.o CLogging.o
-
-nh-vend: nh-vend.o CNHmqtt.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o db/lib/CDBValue.o
-	g++ -lmysqlclient -lmosquitto -lpthread -o nh-vend nh-vend.o CNHmqtt.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o db/lib/CDBValue.o
-	cp nh-vend bin/
-
-nh-test-irc: nh-test-irc.o CNHmqtt_irc.o CNHmqtt.o INIReader.o ini.o CLogging.o
-	g++ -lmosquitto -o nh-test-irc nh-test-irc.o CNHmqtt_irc.o CNHmqtt.o INIReader.o ini.o CLogging.o
-
-#nh-udp2mqtt: nh-udp2mqtt.o CNHmqtt.o INIReader.o ini.o CLogging.o
-#	g++ -lmosquitto -lpthread -o nh-udp2mqtt nh-udp2mqtt.o CNHmqtt.o INIReader.o ini.o CLogging.o
-#	cp nh-udp2mqtt bin/
-
-nh-matrix: nh-matrix.o CNHmqtt_irc.o CNHmqtt.o INIReader.o ini.o CLogging.o
-	g++ -lmosquitto -o nh-matrix nh-matrix.o CNHmqtt_irc.o CNHmqtt.o INIReader.o ini.o CLogging.o
-	cp nh-matrix bin/
-
-nh-temperature: nh-temperature.o CNHmqtt.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o db/lib/CDBValue.o
-	g++ -lmosquitto -lmysqlclient -o nh-temperature nh-temperature.o CNHmqtt.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o db/lib/CDBValue.o
-	cp nh-temperature bin/
-
-nh-irc-misc: nh-irc-misc.o CNHmqtt_irc.o CNHmqtt.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o db/lib/CDBValue.o
-	g++ -lmosquitto -lmysqlclient -o nh-irc-misc nh-irc-misc.o CNHmqtt_irc.o CNHmqtt.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o db/lib/CDBValue.o
-	cp nh-irc-misc bin/
-
-nh-irccat: nh-irccat.o CNHmqtt_irc.o CNHmqtt.o INIReader.o ini.o CLogging.o
-	g++ -lpthread -lmosquitto -o nh-irccat nh-irccat.o CNHmqtt_irc.o CNHmqtt.o INIReader.o ini.o CLogging.o
-	cp nh-irccat bin/
-
-GateKeeper: GateKeeper.o CNHmqtt.o CNHmqtt_irc.o INIReader.o ini.o db/lib/CNHDBAccess.o CLogging.o db/lib/CDBValue.o
-	g++ -lmysqlclient -lmosquitto -lrt -o GateKeeper GateKeeper.o CNHmqtt.o CNHmqtt_irc.o INIReader.o ini.o db/lib/CNHDBAccess.o CLogging.o db/lib/CDBValue.o
-	cp GateKeeper bin/
-
-nh-monitor: nh-monitor.o CNHmqtt.o INIReader.o ini.o db/lib/CNHDBAccess.o CLogging.o db/lib/CDBValue.o
-	g++ -lmysqlclient -lmosquitto -lpthread -o nh-monitor nh-monitor.o CNHmqtt.o INIReader.o ini.o db/lib/CNHDBAccess.o CLogging.o db/lib/CDBValue.o
-	cp nh-monitor bin/
-
-nh-irc: nh-irc.o CNHmqtt.o INIReader.o ini.o irc.o CLogging.o
-	g++ -lmosquitto -lrt -o nh-irc nh-irc.o CNHmqtt.o INIReader.o ini.o irc.o CLogging.o
-	cp nh-irc bin/
-
-nh-mail: nh-mail.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o CEmailProcess.o db/lib/CDBValue.o
-	g++ -lmysqlclient -lmosquitto -o nh-mail nh-mail.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o CEmailProcess.o db/lib/CDBValue.o
-	cp nh-mail bin/
-
-nh-macmon: nh-macmon.o CNHmqtt.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o CMacmon.o db/lib/CDBValue.o
-	g++ -lpcap -lmysqlclient -lmosquitto -o nh-macmon CNHmqtt.o nh-macmon.o INIReader.o ini.o CLogging.o db/lib/CNHDBAccess.o CMacmon.o db/lib/CDBValue.o
-	cp nh-macmon bin/
+
+SRC_DIR = cpp/
+DATABASE = database/
+BUILD_DIR = build/
+
+OBJ_BASE = CNHmqtt.o INIReader.o ini.o CLogging.o
+OBJS_BASE  := $(addprefix $(BUILD_DIR),$(OBJ_BASE))
+
+OBJ_DBLIB = CNHDBAccess.o CDBValue.o
+OBJS_DBLIB  := $(addprefix $(BUILD_DIR),$(OBJ_DBLIB))
+
+CC_OUT = -o $(BUILD_DIR)$(notdir $@)
+
+BIN_OUT = bin/
+
+CFLAGS = -Wall -c -g
+LFLAGS = -Wall -g
+CC = g++
+
+
+all: nh-test nh-irc GateKeeper nh-test-irc nh-irc-misc nh-irccat nh-monitor nh-matrix nh-temperature nh-vend nh-mail nh-tts db/lib/CNHDBAccess.php 
+
+nh-test: $(BUILD_DIR)nh-test.o $(OBJS_BASE)
+	g++ -lmosquitto -o $(BIN_OUT)nh-test $(BUILD_DIR)nh-test.o $(OBJS_BASE)
+
+nh-tts: $(BUILD_DIR)nh-tts.o $(OBJS_BASE)
+	g++ -lmosquitto -lpthread -o $(BIN_OUT)nh-tts $(BUILD_DIR)nh-tts.o $(OBJS_BASE)
+
+nh-vend: $(BUILD_DIR)nh-vend.o $(OBJS_BASE) $(OBJS_DBLIB)
+	g++ -lmysqlclient -lmosquitto -lpthread -o $(BIN_OUT)nh-vend $(BUILD_DIR)nh-vend.o $(OBJS_BASE) $(OBJS_DBLIB)
+
+nh-test-irc: $(BUILD_DIR)nh-test-irc.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE)
+	g++ -lmosquitto -o $(BIN_OUT)nh-test-irc $(BUILD_DIR)nh-test-irc.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE)
+
+nh-matrix: $(BUILD_DIR)nh-matrix.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE)
+	g++ -lmosquitto -o $(BIN_OUT)nh-matrix  $(BUILD_DIR)nh-matrix.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE)
+
+nh-temperature: $(BUILD_DIR)nh-temperature.o $(OBJS_BASE) $(OBJS_DBLIB)
+	g++ -lmosquitto -lmysqlclient -o $(BIN_OUT)nh-temperature $(BUILD_DIR)nh-temperature.o $(OBJS_BASE) $(OBJS_DBLIB)
+
+nh-irc-misc: $(BUILD_DIR)nh-irc-misc.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE) $(OBJS_DBLIB)
+	g++ -lmosquitto -lmysqlclient -o $(BIN_OUT)nh-irc-misc $(BUILD_DIR)nh-irc-misc.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE) $(OBJS_DBLIB)
+
+nh-irccat: $(BUILD_DIR)nh-irccat.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE)
+	g++ -lpthread -lmosquitto -o $(BIN_OUT)nh-irccat $(BUILD_DIR)nh-irccat.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE)
+
+GateKeeper: $(BUILD_DIR)GateKeeper.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE) $(OBJS_DBLIB)
+	g++ -lmysqlclient -lmosquitto -lrt -o $(BIN_OUT)GateKeeper $(BUILD_DIR)GateKeeper.o $(BUILD_DIR)CNHmqtt_irc.o $(OBJS_BASE) $(OBJS_DBLIB)
+
+nh-monitor: $(BUILD_DIR)nh-monitor.o $(OBJS_BASE) $(OBJS_DBLIB)
+	g++ -lmysqlclient -lmosquitto -lpthread -o $(BIN_OUT)nh-monitor $(BUILD_DIR)nh-monitor.o $(OBJS_BASE) $(OBJS_DBLIB)
+
+nh-irc: $(BUILD_DIR)nh-irc.o $(BUILD_DIR)irc.o $(OBJS_BASE)
+	g++ -lmosquitto -lrt -o $(BIN_OUT)nh-irc $(BUILD_DIR)nh-irc.o $(BUILD_DIR)irc.o $(OBJS_BASE)
+
+nh-mail: $(BUILD_DIR)nh-mail.o $(BUILD_DIR)CEmailProcess.o $(BUILD_DIR)INIReader.o $(BUILD_DIR)ini.o $(BUILD_DIR)CLogging.o $(OBJS_DBLIB)
+	g++ -lmysqlclient -lmosquitto -o $(BIN_OUT)nh-mail $(BUILD_DIR)nh-mail.o $(BUILD_DIR)CEmailProcess.o $(BUILD_DIR)INIReader.o $(BUILD_DIR)ini.o $(BUILD_DIR)CLogging.o $(OBJS_DBLIB)
+
+nh-macmon: $(BUILD_DIR)nh-macmon.o $(BUILD_DIR)CMacmon.o $(OBJS_BASE) $(OBJS_DBLIB)
+	g++ -lpcap -lmysqlclient -lmosquitto -o $(BIN_OUT)nh-macmon $(BUILD_DIR)nh-macmon.o $(BUILD_DIR)CMacmon.o $(OBJS_BASE) $(OBJS_DBLIB)
 
 web/nhweb/build/script/custom.js: $(wildcard web/nhweb/source/class/custom/*)
 	sh nhweb.sh
@@ -104,102 +79,101 @@ web2: nh-web db/lib/CNHDBAccess.php web/vend.php web/db.php web/wikiauth.php
 	cp web/krb5_auth.php website/
 
 
-CNHmqtt.o: CNHmqtt.cpp CNHmqtt.h
-	g++ -Wall -c CNHmqtt.cpp
-
-nh-mail.o: nh-mail.cpp nh-mail.h db/lib/CNHDBAccess.h
-	g++ -Wall -c nh-mail.cpp
+$(BUILD_DIR)CNHmqtt.o: $(SRC_DIR)CNHmqtt.cpp $(SRC_DIR)CNHmqtt.h
+	g++ -Wall -c $(SRC_DIR)CNHmqtt.cpp $(CC_OUT)
 
-CNHmqtt_irc.o: CNHmqtt_irc.cpp CNHmqtt_irc.h
-	g++ -Wall -c CNHmqtt_irc.cpp
+$(BUILD_DIR)nh-mail.o: $(SRC_DIR)nh-mail.cpp $(SRC_DIR)nh-mail.h db/lib/CNHDBAccess.h
+	g++ -Wall -c $(SRC_DIR)nh-mail.cpp $(CC_OUT)
 
-nh-test.o: nh-test.cpp nh-test.h
-	g++ -Wall -c nh-test.cpp
+$(BUILD_DIR)CNHmqtt_irc.o: $(SRC_DIR)CNHmqtt_irc.cpp $(SRC_DIR)CNHmqtt_irc.h
+	g++ -Wall -c $(SRC_DIR)CNHmqtt_irc.cpp $(CC_OUT)
 
-nh-tts.o: nh-tts.cpp nh-tts.h
-	g++ -Wall -c nh-tts.cpp
+$(BUILD_DIR)nh-test.o: $(SRC_DIR)nh-test.cpp $(SRC_DIR)nh-test.h
+	g++ -Wall -c $(SRC_DIR)nh-test.cpp $(CC_OUT)
 
-nh-vend.o: nh-vend.cpp nh-vend.h
-	g++ -Wall -c nh-vend.cpp
+$(BUILD_DIR)nh-tts.o: $(SRC_DIR)nh-tts.cpp $(SRC_DIR)nh-tts.h
+	g++ -Wall -c $(SRC_DIR)nh-tts.cpp $(CC_OUT)
 
-nh-test-irc.o: nh-test-irc.cpp nh-test-irc.h
-	g++ -Wall -c nh-test-irc.cpp
+$(BUILD_DIR)nh-vend.o: $(SRC_DIR)nh-vend.cpp $(SRC_DIR)nh-vend.h
+	g++ -Wall -c $(SRC_DIR)nh-vend.cpp $(CC_OUT)
 
-#nh-udp2mqtt.o: nh-udp2mqtt.cpp nh-udp2mqtt.h
-#	g++ -Wall -c nh-udp2mqtt.cpp
+$(BUILD_DIR)nh-test-irc.o: $(SRC_DIR)nh-test-irc.cpp $(SRC_DIR)nh-test-irc.h
+	g++ -Wall -c $(SRC_DIR)nh-test-irc.cpp $(CC_OUT)
 
-nh-matrix.o: nh-matrix.cpp nh-matrix.h
-	g++ -Wall -c nh-matrix.cpp
+$(BUILD_DIR)nh-matrix.o: $(SRC_DIR)nh-matrix.cpp $(SRC_DIR)nh-matrix.h
+	g++ -Wall -c $(SRC_DIR)nh-matrix.cpp $(CC_OUT)
 
-nh-temperature.o: nh-temperature.cpp nh-temperature.h db/lib/CNHDBAccess.o
-	g++ -Wall -c nh-temperature.cpp
+$(BUILD_DIR)nh-temperature.o: $(SRC_DIR)nh-temperature.cpp $(SRC_DIR)nh-temperature.h db/lib/CNHDBAccess.o
+	g++ -Wall -c $(SRC_DIR)nh-temperature.cpp $(CC_OUT)
 
-nh-irc-misc.o: nh-irc-misc.cpp nh-irc-misc.h
-	g++ -Wall -c nh-irc-misc.cpp
+$(BUILD_DIR)nh-irc-misc.o: $(SRC_DIR)nh-irc-misc.cpp $(SRC_DIR)nh-irc-misc.h
+	g++ -Wall -c $(SRC_DIR)nh-irc-misc.cpp $(CC_OUT)
 
-nh-macmon.o: nh-macmon.cpp nh-macmon.h db/lib/CNHDBAccess.h
-	g++ -Wall -c nh-macmon.cpp
+$(BUILD_DIR)nh-macmon.o: $(SRC_DIR)nh-macmon.cpp $(SRC_DIR)nh-macmon.h db/lib/CNHDBAccess.h
+	g++ -Wall -c $(SRC_DIR)nh-macmon.cpp $(CC_OUT)
 
-irccat.o: nh-irccat.cpp nh-irccat.h
-	g++ -Wall -c nh-irccat.cpp
+$(BUILD_DIR)nh-irccat.o: $(SRC_DIR)nh-irccat.cpp $(SRC_DIR)nh-irccat.h
+	g++ -Wall -c $(SRC_DIR)nh-irccat.cpp $(CC_OUT)
 
-GateKeeper.o: GateKeeper.cpp db/lib/CNHDBAccess.h
-	g++ -Wall -c GateKeeper.cpp
+$(BUILD_DIR)GateKeeper.o: $(SRC_DIR)GateKeeper.cpp db/lib/CNHDBAccess.h
+	g++ -Wall -c $(SRC_DIR)GateKeeper.cpp $(CC_OUT)
 
-nh-monitor.o: nh-monitor.cpp db/lib/CNHDBAccess.h
-	g++ -Wall -c nh-monitor.cpp
+$(BUILD_DIR)nh-monitor.o: $(SRC_DIR)nh-monitor.cpp db/lib/CNHDBAccess.h
+	g++ -Wall -c $(SRC_DIR)nh-monitor.cpp $(CC_OUT)
 
-nh-irc.o: nh-irc.cpp
-	g++ -Wall -Wextra -c nh-irc.cpp
+$(BUILD_DIR)nh-irc.o: $(SRC_DIR)nh-irc.cpp
+	g++ -Wall -Wextra -c $(SRC_DIR)nh-irc.cpp $(CC_OUT)
 
-irc.o: irc.cpp irc.h
-	g++ -c irc.cpp 
+$(BUILD_DIR)irc.o: $(SRC_DIR)irc.cpp $(SRC_DIR)irc.h
+	g++ -c $(SRC_DIR)irc.cpp  $(CC_OUT)
 
-ini.o: inireader/ini.c inireader/ini.h
-	gcc -c inireader/ini.c
+$(BUILD_DIR)ini.o: $(SRC_DIR)inireader/ini.c $(SRC_DIR)inireader/ini.h
+	gcc -c $(SRC_DIR)inireader/ini.c $(CC_OUT)
 
-INIReaderTest.o: inireader/INIReaderTest.cpp
-	g++ -c inireader/INIReaderTest.cpp
+$(BUILD_DIR)INIReaderTest.o: $(SRC_DIR)inireader/INIReaderTest.cpp
+	g++ -c $(SRC_DIR)inireader/INIReaderTest.cpp $(CC_OUT)
 
-INIReader.o: inireader/INIReader.cpp inireader/INIReader.h
-	g++ -c inireader/INIReader.cpp
+$(BUILD_DIR)INIReader.o: $(SRC_DIR)inireader/INIReader.cpp $(SRC_DIR)inireader/INIReader.h
+	g++ -c $(SRC_DIR)inireader/INIReader.cpp $(CC_OUT)
 
-INIReaderTest: ini.o INIReaderTest.o INIReader.o
-	g++ -o INIReaderTest INIReader.o INIReaderTest.o ini.o
+INIReaderTest: $(BUILD_DIR)ini.o $(BUILD_DIR)INIReaderTest.o $(BUILD_DIR)INIReader.o
+	g++ -o INIReaderTest $(BUILD_DIR)INIReader.o $(BUILD_DIR)INIReaderTest.o $(BUILD_DIR)ini.o
 
-CLogging.o: CLogging.cpp CLogging.h
-	g++ -c CLogging.cpp
+$(BUILD_DIR)CLogging.o: $(SRC_DIR)CLogging.cpp $(SRC_DIR)CLogging.h
+	g++ -c $(SRC_DIR)CLogging.cpp $(CC_OUT)
 
-CEmailProcess.o: CEmailProcess.cpp CEmailProcess.h
-	g++ -Wall -c CEmailProcess.cpp
+$(BUILD_DIR)CEmailProcess.o: $(SRC_DIR)CEmailProcess.cpp $(SRC_DIR)CEmailProcess.h
+	g++ -Wall -c $(SRC_DIR)CEmailProcess.cpp $(CC_OUT)
 
-CalcWordCount.o: CalcWordCount.cpp
-	g++ -Wall -c CalcWordCount.cpp
+$(BUILD_DIR)CalcWordCount.o: $(SRC_DIR)CalcWordCount.cpp
+	g++ -Wall -c $(SRC_DIR)CalcWordCount.cpp $(CC_OUT)
 
-CMacmon.o: CMacmon.cpp CMacmon.h
-	g++ -Wall -c CMacmon.cpp
+$(BUILD_DIR)CMacmon.o: $(SRC_DIR)CMacmon.cpp $(SRC_DIR)CMacmon.h
+	g++ -Wall -c $(SRC_DIR)CMacmon.cpp 
 
 
-dblib: db/lib/gen_dblib
+dblib: $(BUILD_DIR)gen_dblib
 
-db/lib/gen_dblib: db/lib/gen_dblib.c
-	gcc -Wall -o db/lib/gen_dblib db/lib/gen_dblib.c
+$(BUILD_DIR)gen_dblib: db/lib/gen_dblib.c
+	gcc -Wall -o $(BUILD_DIR)gen_dblib db/lib/gen_dblib.c
 
-db/lib/CNHDBAccess.cpp: db/lib/gen_dblib db/lib/CNHDBAccess_template.cpp $(wildcard db/sp_*.sql)
-	db/lib/gen_dblib db/lib $(wildcard db/sp_*.sql)
+db/lib/CNHDBAccess.cpp: $(BUILD_DIR)gen_dblib db/lib/CNHDBAccess_template.cpp $(wildcard db/sp_*.sql)
+	$(BUILD_DIR)gen_dblib db/lib $(wildcard db/sp_*.sql)
 
-db/lib/CNHDBAccess.h: db/lib/gen_dblib db/lib/CNHDBAccess_template.h $(wildcard db/sp_*.sql)
-	db/lib/gen_dblib db/lib $(wildcard db/sp_*.sql)
+db/lib/CNHDBAccess.h: $(BUILD_DIR)gen_dblib db/lib/CNHDBAccess_template.h $(wildcard db/sp_*.sql)
+	$(BUILD_DIR)gen_dblib db/lib $(wildcard db/sp_*.sql)
 
-db/lib/CNHDBAccess.php: db/lib/gen_dblib db/lib/CNHDBAccess_template.php $(wildcard db/sp_*.sql)
-	db/lib/gen_dblib db/lib $(wildcard db/sp_*.sql)
+db/lib/CNHDBAccess.php: $(BUILD_DIR)gen_dblib db/lib/CNHDBAccess_template.php $(wildcard db/sp_*.sql)
+	$(BUILD_DIR)gen_dblib db/lib $(wildcard db/sp_*.sql)
 
-db/lib/CNHDBAccess.o: db/lib/CNHDBAccess.cpp db/lib/CNHDBAccess.h 
-	g++ -Wall -c db/lib/CNHDBAccess.cpp -o db/lib/CNHDBAccess.o
+$(BUILD_DIR)CNHDBAccess.o: db/lib/CNHDBAccess.cpp db/lib/CNHDBAccess.h 
+	g++ -Wall -c db/lib/CNHDBAccess.cpp -o $(BUILD_DIR)CNHDBAccess.o
 
-db/lib/CDBValue.o: db/lib/CDBValue.cpp db/lib/CDBValue.cpp db/lib/CDBValue.cpp db/lib/CDBValue.h
-	g++ -Wall -c db/lib/CDBValue.cpp -o db/lib/CDBValue.o
+$(BUILD_DIR)CDBValue.o: db/lib/CDBValue.cpp db/lib/CDBValue.cpp db/lib/CDBValue.cpp db/lib/CDBValue.h
+	g++ -Wall -c db/lib/CDBValue.cpp -o $(BUILD_DIR)CDBValue.o
 
 clean:
-	rm -f db/lib/gen_dblib db/lib/CNHDBAccess.cpp db/lib/CNHDBAccess.h db/lib/CNHDBAccess.o nh-monitor.o nh-monitor CNHDBAccess.o CDBValue.o nh-irc-misc.o nh-irccat.o nh-test-irc.o CNHmqtt_irc.o nh-irc nh-test nh-irccat nh-test-irc nh-irc-misc INIReaderTest GateKeeper_dbaccess.o GateKeeper.o GateKeeper mos_irc irc.o mos_irc.o nh-test.o CNHmqtt.o ini.o INIReader.o INIReaderTest.o nh-irc.o nh-gk-if.o CLogging.o nh-matrix.o nh-matrix nh-temperature.o nh-temperature nh-vend.o nh-vend nh-mail nh-mail.o nh-macmon nh-macmon.o CMacmon.o CEmailProcess.o web/nhweb/build/script/custom.js nh-tts nh-tts.o
-	rm -rf website/
+	rm -fv build/*
+	rm -fv bin/*
+	rm -fv web/nhweb/build/script/custom.js
+	rm -rfv website/
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/cpp/CDBValue.h b/cpp/CDBValue.h
new file mode 120000
index 0000000..369a7ab
--- /dev/null
+++ b/cpp/CDBValue.h
@@ -0,0 +1 @@
+../db/lib/CDBValue.h
\ No newline at end of file
diff --git a/CEmailProcess.cpp b/cpp/CEmailProcess.cpp
similarity index 100%
rename from CEmailProcess.cpp
rename to cpp/CEmailProcess.cpp
diff --git a/CEmailProcess.h b/cpp/CEmailProcess.h
similarity index 100%
rename from CEmailProcess.h
rename to cpp/CEmailProcess.h
diff --git a/CLogging.cpp b/cpp/CLogging.cpp
similarity index 100%
rename from CLogging.cpp
rename to cpp/CLogging.cpp
diff --git a/CLogging.h b/cpp/CLogging.h
similarity index 100%
rename from CLogging.h
rename to cpp/CLogging.h
diff --git a/CMacmon.cpp b/cpp/CMacmon.cpp
similarity index 100%
rename from CMacmon.cpp
rename to cpp/CMacmon.cpp
diff --git a/CMacmon.h b/cpp/CMacmon.h
similarity index 100%
rename from CMacmon.h
rename to cpp/CMacmon.h
diff --git a/cpp/CNHDBAccess.cpp b/cpp/CNHDBAccess.cpp
new file mode 120000
index 0000000..f88091d
--- /dev/null
+++ b/cpp/CNHDBAccess.cpp
@@ -0,0 +1 @@
+../db/lib/CNHDBAccess.cpp
\ No newline at end of file
diff --git a/cpp/CNHDBAccess.h b/cpp/CNHDBAccess.h
new file mode 120000
index 0000000..6bfc66d
--- /dev/null
+++ b/cpp/CNHDBAccess.h
@@ -0,0 +1 @@
+../db/lib/CNHDBAccess.h
\ No newline at end of file
diff --git a/CNHmqtt.cpp b/cpp/CNHmqtt.cpp
similarity index 100%
rename from CNHmqtt.cpp
rename to cpp/CNHmqtt.cpp
diff --git a/CNHmqtt.h b/cpp/CNHmqtt.h
similarity index 100%
rename from CNHmqtt.h
rename to cpp/CNHmqtt.h
diff --git a/CNHmqtt_irc.cpp b/cpp/CNHmqtt_irc.cpp
similarity index 100%
rename from CNHmqtt_irc.cpp
rename to cpp/CNHmqtt_irc.cpp
diff --git a/CNHmqtt_irc.h b/cpp/CNHmqtt_irc.h
similarity index 100%
rename from CNHmqtt_irc.h
rename to cpp/CNHmqtt_irc.h
diff --git a/GateKeeper.cpp b/cpp/GateKeeper.cpp
similarity index 99%
rename from GateKeeper.cpp
rename to cpp/GateKeeper.cpp
index 9ac3fff..236a1cb 100644
--- a/GateKeeper.cpp
+++ b/cpp/GateKeeper.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "CNHmqtt_irc.h"
-#include "db/lib/CNHDBAccess.h"
+#include "CNHDBAccess.h"
 
 #include <stdio.h>
 #include <time.h>
diff --git a/inireader/INIReader.cpp b/cpp/inireader/INIReader.cpp
similarity index 100%
rename from inireader/INIReader.cpp
rename to cpp/inireader/INIReader.cpp
diff --git a/inireader/INIReader.h b/cpp/inireader/INIReader.h
similarity index 100%
rename from inireader/INIReader.h
rename to cpp/inireader/INIReader.h
diff --git a/inireader/INIReaderTest.cpp b/cpp/inireader/INIReaderTest.cpp
similarity index 100%
rename from inireader/INIReaderTest.cpp
rename to cpp/inireader/INIReaderTest.cpp
diff --git a/inireader/LICENSE.txt b/cpp/inireader/LICENSE.txt
similarity index 100%
rename from inireader/LICENSE.txt
rename to cpp/inireader/LICENSE.txt
diff --git a/inireader/ini.c b/cpp/inireader/ini.c
similarity index 100%
rename from inireader/ini.c
rename to cpp/inireader/ini.c
diff --git a/inireader/ini.h b/cpp/inireader/ini.h
similarity index 100%
rename from inireader/ini.h
rename to cpp/inireader/ini.h
diff --git a/inireader/iniread b/cpp/inireader/iniread
similarity index 100%
rename from inireader/iniread
rename to cpp/inireader/iniread
diff --git a/irc.cpp b/cpp/irc.cpp
similarity index 100%
rename from irc.cpp
rename to cpp/irc.cpp
diff --git a/irc.h b/cpp/irc.h
similarity index 100%
rename from irc.h
rename to cpp/irc.h
diff --git a/nh-irc-misc.cpp b/cpp/nh-irc-misc.cpp
similarity index 99%
rename from nh-irc-misc.cpp
rename to cpp/nh-irc-misc.cpp
index fdc7e19..50ae1e3 100644
--- a/nh-irc-misc.cpp
+++ b/cpp/nh-irc-misc.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "CNHmqtt_irc.h"
-#include "db/lib/CNHDBAccess.h"
+#include "CNHDBAccess.h"
 #include "nh-irc-misc.h"
 
 class nh_irc_misc : public CNHmqtt_irc
diff --git a/nh-irc-misc.h b/cpp/nh-irc-misc.h
similarity index 100%
rename from nh-irc-misc.h
rename to cpp/nh-irc-misc.h
diff --git a/nh-irc.cpp b/cpp/nh-irc.cpp
similarity index 100%
rename from nh-irc.cpp
rename to cpp/nh-irc.cpp
diff --git a/nh-irccat.cpp b/cpp/nh-irccat.cpp
similarity index 100%
rename from nh-irccat.cpp
rename to cpp/nh-irccat.cpp
diff --git a/nh-irccat.h b/cpp/nh-irccat.h
similarity index 100%
rename from nh-irccat.h
rename to cpp/nh-irccat.h
diff --git a/nh-macmon.cpp b/cpp/nh-macmon.cpp
similarity index 100%
rename from nh-macmon.cpp
rename to cpp/nh-macmon.cpp
diff --git a/nh-macmon.h b/cpp/nh-macmon.h
similarity index 100%
rename from nh-macmon.h
rename to cpp/nh-macmon.h
diff --git a/nh-mail.cpp b/cpp/nh-mail.cpp
similarity index 100%
rename from nh-mail.cpp
rename to cpp/nh-mail.cpp
diff --git a/nh-mail.h b/cpp/nh-mail.h
similarity index 97%
rename from nh-mail.h
rename to cpp/nh-mail.h
index c143ba5..14081e9 100644
--- a/nh-mail.h
+++ b/cpp/nh-mail.h
@@ -4,7 +4,7 @@
 #include "mosquitto.h"
 #include "CLogging.h"
 #include "inireader/INIReader.h"
-#include "db/lib/CNHDBAccess.h"
+#include "CNHDBAccess.h"
 
 #define EXIT_TERMINATE 1 
 #define EXIT_RESET 2
diff --git a/nh-matrix.cpp b/cpp/nh-matrix.cpp
similarity index 100%
rename from nh-matrix.cpp
rename to cpp/nh-matrix.cpp
diff --git a/nh-matrix.h b/cpp/nh-matrix.h
similarity index 100%
rename from nh-matrix.h
rename to cpp/nh-matrix.h
diff --git a/nh-monitor.cpp b/cpp/nh-monitor.cpp
similarity index 99%
rename from nh-monitor.cpp
rename to cpp/nh-monitor.cpp
index 8baa9f2..243ae31 100644
--- a/nh-monitor.cpp
+++ b/cpp/nh-monitor.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "CNHmqtt_irc.h"
-#include "db/lib/CNHDBAccess.h"
+#include "CNHDBAccess.h"
 
 #include <stdio.h>
 #include <dirent.h>
diff --git a/nh-temperature.cpp b/cpp/nh-temperature.cpp
similarity index 99%
rename from nh-temperature.cpp
rename to cpp/nh-temperature.cpp
index bb7c4be..5a06472 100644
--- a/nh-temperature.cpp
+++ b/cpp/nh-temperature.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "CNHmqtt.h"
-#include "db/lib/CNHDBAccess.h"
+#include "CNHDBAccess.h"
 #include "nh-temperature.h"
 #include <string>
 #include <sstream>
diff --git a/nh-temperature.h b/cpp/nh-temperature.h
similarity index 100%
rename from nh-temperature.h
rename to cpp/nh-temperature.h
diff --git a/nh-test-irc.cpp b/cpp/nh-test-irc.cpp
similarity index 100%
rename from nh-test-irc.cpp
rename to cpp/nh-test-irc.cpp
diff --git a/nh-test-irc.h b/cpp/nh-test-irc.h
similarity index 100%
rename from nh-test-irc.h
rename to cpp/nh-test-irc.h
diff --git a/nh-test.cpp b/cpp/nh-test.cpp
similarity index 100%
rename from nh-test.cpp
rename to cpp/nh-test.cpp
diff --git a/nh-test.h b/cpp/nh-test.h
similarity index 100%
rename from nh-test.h
rename to cpp/nh-test.h
diff --git a/nh-tts.cpp b/cpp/nh-tts.cpp
similarity index 100%
rename from nh-tts.cpp
rename to cpp/nh-tts.cpp
diff --git a/nh-tts.h b/cpp/nh-tts.h
similarity index 100%
rename from nh-tts.h
rename to cpp/nh-tts.h
diff --git a/nh-vend.cpp b/cpp/nh-vend.cpp
similarity index 100%
rename from nh-vend.cpp
rename to cpp/nh-vend.cpp
diff --git a/nh-vend.h b/cpp/nh-vend.h
similarity index 97%
rename from nh-vend.h
rename to cpp/nh-vend.h
index d66428e..08eb556 100644
--- a/nh-vend.h
+++ b/cpp/nh-vend.h
@@ -1,8 +1,7 @@
 bool CNHmqtt::debug_mode = false;
 bool CNHmqtt::daemonized = false;
 
-#include "db/lib/CNHDBAccess.h"
-//#include "CVMC.h"
+#include "CNHDBAccess.h"
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/types.h>
diff --git a/db/lib/CDBValue.h b/db/lib/CDBValue.h
index 35b9562..6cff351 100644
--- a/db/lib/CDBValue.h
+++ b/db/lib/CDBValue.h
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <string>
 #include <stdlib.h>
-#include "../../CLogging.h"
+#include "CLogging.h"
 
 #define VAL_TYPE_INT 1
 #define VAL_TYPE_VARCHAR 2
diff --git a/db/lib/CLogging.h b/db/lib/CLogging.h
new file mode 120000
index 0000000..4534e40
--- /dev/null
+++ b/db/lib/CLogging.h
@@ -0,0 +1 @@
+../../cpp/CLogging.h
\ No newline at end of file
diff --git a/db/lib/CNHDBAccess_template.cpp b/db/lib/CNHDBAccess_template.cpp
index 34ae8e7..387506d 100644
--- a/db/lib/CNHDBAccess_template.cpp
+++ b/db/lib/CNHDBAccess_template.cpp
@@ -33,7 +33,6 @@
 #include <cstdio>
 #include <string>
 #include <stdlib.h>
-#include "../../CLogging.h"
 #include <sstream>
 
 /* TODO: Add support for P_TYPE_TEXT (MySQL "TEXT" field type) */
diff --git a/db/lib/CNHDBAccess_template.h b/db/lib/CNHDBAccess_template.h
index bed0199..d4fb628 100644
--- a/db/lib/CNHDBAccess_template.h
+++ b/db/lib/CNHDBAccess_template.h
@@ -6,7 +6,7 @@
 #include <list>
 #include <string>
 #include <time.h>
-#include "../../CLogging.h"
+#include "CLogging.h"
 #include "CDBValue.h"