diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/unit_tests.pro b/src/libfwbuilder/src/fwbuilder/unit_tests/unit_tests.pro
deleted file mode 100644
index 25feaec01..000000000
--- a/src/libfwbuilder/src/fwbuilder/unit_tests/unit_tests.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-DOLLAR = $
-
-build_tests.commands = echo "Building tests..."; \
-               ./unit_tests.sh make build_tests
-
-run_tests.commands = echo "Running tests..."; \
-               ./unit_tests.sh make run_tests
-
-clean_tests.commands = echo "Cleaning tests..."; \
-                 ./unit_tests.sh make clean_tests
-
-QMAKE_EXTRA_TARGETS += run_tests clean_tests build_tests
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/unit_tests.sh b/src/libfwbuilder/src/fwbuilder/unit_tests/unit_tests.sh
deleted file mode 100755
index 3c3b434c4..000000000
--- a/src/libfwbuilder/src/fwbuilder/unit_tests/unit_tests.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-commands=$@
-
-for directory in `find . -maxdepth 1 -type d -regex '\./[A-Za-z0-9\-\_]*'`
-do
-    cd $directory
-    [ ! -e Makefile ] && qmake -spec $QMAKESPEC
-    $commands || exit 1
-    cd -
-done;
\ No newline at end of file
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/AddressTableTest.cpp b/src/unit_tests/AddressTableTest/AddressTableTest.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/AddressTableTest.cpp
rename to src/unit_tests/AddressTableTest/AddressTableTest.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/AddressTableTest.h b/src/unit_tests/AddressTableTest/AddressTableTest.h
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/AddressTableTest.h
rename to src/unit_tests/AddressTableTest/AddressTableTest.h
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/AddressTableTest.pro b/src/unit_tests/AddressTableTest/AddressTableTest.pro
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/AddressTableTest.pro
rename to src/unit_tests/AddressTableTest/AddressTableTest.pro
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/addresstable-1.txt b/src/unit_tests/AddressTableTest/addresstable-1.txt
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/addresstable-1.txt
rename to src/unit_tests/AddressTableTest/addresstable-1.txt
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/addresstable-2.txt b/src/unit_tests/AddressTableTest/addresstable-2.txt
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/addresstable-2.txt
rename to src/unit_tests/AddressTableTest/addresstable-2.txt
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/main.cpp b/src/unit_tests/AddressTableTest/main.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/AddressTableTest/main.cpp
rename to src/unit_tests/AddressTableTest/main.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/DNSTest/DNSTest.cpp b/src/unit_tests/DNSTest/DNSTest.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/DNSTest/DNSTest.cpp
rename to src/unit_tests/DNSTest/DNSTest.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/DNSTest/DNSTest.h b/src/unit_tests/DNSTest/DNSTest.h
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/DNSTest/DNSTest.h
rename to src/unit_tests/DNSTest/DNSTest.h
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/DNSTest/DNSTest.pro b/src/unit_tests/DNSTest/DNSTest.pro
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/DNSTest/DNSTest.pro
rename to src/unit_tests/DNSTest/DNSTest.pro
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/DNSTest/main.cpp b/src/unit_tests/DNSTest/main.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/DNSTest/main.cpp
rename to src/unit_tests/DNSTest/main.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/FWObjectTest/FWObjectTest.cpp b/src/unit_tests/FWObjectTest/FWObjectTest.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/FWObjectTest/FWObjectTest.cpp
rename to src/unit_tests/FWObjectTest/FWObjectTest.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/FWObjectTest/FWObjectTest.h b/src/unit_tests/FWObjectTest/FWObjectTest.h
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/FWObjectTest/FWObjectTest.h
rename to src/unit_tests/FWObjectTest/FWObjectTest.h
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/FWObjectTest/FWObjectTest.pro b/src/unit_tests/FWObjectTest/FWObjectTest.pro
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/FWObjectTest/FWObjectTest.pro
rename to src/unit_tests/FWObjectTest/FWObjectTest.pro
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/FWObjectTest/main.cpp b/src/unit_tests/FWObjectTest/main.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/FWObjectTest/main.cpp
rename to src/unit_tests/FWObjectTest/main.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.cpp b/src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.cpp
rename to src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.h b/src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.h
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.h
rename to src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.h
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.pro b/src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.pro
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.pro
rename to src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.pro
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/Inet6AddrMaskTest/main.cpp b/src/unit_tests/Inet6AddrMaskTest/main.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/Inet6AddrMaskTest/main.cpp
rename to src/unit_tests/Inet6AddrMaskTest/main.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/InetAddrMaskTest/InetAddrMaskTest.cpp b/src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/InetAddrMaskTest/InetAddrMaskTest.cpp
rename to src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/InetAddrMaskTest/InetAddrMaskTest.h b/src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.h
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/InetAddrMaskTest/InetAddrMaskTest.h
rename to src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.h
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/InetAddrMaskTest/InetAddrMaskTest.pro b/src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.pro
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/InetAddrMaskTest/InetAddrMaskTest.pro
rename to src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.pro
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/InetAddrMaskTest/main.cpp b/src/unit_tests/InetAddrMaskTest/main.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/InetAddrMaskTest/main.cpp
rename to src/unit_tests/InetAddrMaskTest/main.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp b/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp
rename to src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/ObjectMatcherTest.h b/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.h
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/ObjectMatcherTest.h
rename to src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.h
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/ObjectMatcherTest.pro b/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.pro
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/ObjectMatcherTest.pro
rename to src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.pro
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/main.cpp b/src/unit_tests/ObjectMatcherTest/main.cpp
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/main.cpp
rename to src/unit_tests/ObjectMatcherTest/main.cpp
diff --git a/src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/test_data.fwb b/src/unit_tests/ObjectMatcherTest/test_data.fwb
similarity index 100%
rename from src/libfwbuilder/src/fwbuilder/unit_tests/ObjectMatcherTest/test_data.fwb
rename to src/unit_tests/ObjectMatcherTest/test_data.fwb