diff --git a/Knot.files b/Knot.files
index 5ce3622650ee9fb93fc66f49f8edf94726438c1e..8bb20729cb2557d0f6c02cdce05c1f92ab329e9b 100644
--- a/Knot.files
+++ b/Knot.files
@@ -4,6 +4,64 @@ Doxy.page.h
 Doxyfile
 Doxyfile.devel
 configure.ac
+tests/querytcp.c
+libknot/Makefile.am
+libknot/dnslib-common.h
+libknot/dname.h
+libknot/dname.c
+libknot/rrset.h
+libknot/rrset.c
+libknot/dnslib-error.c
+libknot/error.h
+libknot/rdata.h
+libknot/rdata.c
+libknot/node.h
+libknot/node.c
+libknot/consts.h
+libknot/descriptor.h
+libknot/descriptor.c
+libknot/zone.h
+libknot/zone.c
+libknot/packet.h
+libknot/packet.c
+libknot/query.h
+libknot/query.c
+libknot/response2.h
+libknot/response2.c
+libknot/response.h
+libknot/wire.h
+libknot/response.c
+libknot/edns.h
+libknot/edns.c
+libknot/utils.h
+libknot/utils.c
+libknot/zonedb.h
+libknot/zonedb.c
+libknot/debug.h
+libknot/debug.c
+libknot/dnslib.h
+libknot/tolower.h
+libknot/tolower.c
+libknot/nsec3.h
+libknot/nsec3.c
+libknot/changesets.h
+libknot/changesets.c
+libknot/zone-contents.c
+libknot/zone-contents.h
+libknot/zone-tree.h
+libknot/zone-tree.c
+libknot/xfr-in.h
+libknot/xfr-in.c
+libknot/name-server.c
+libknot/name-server.h
+libknot/dname-table.h
+libknot/dname-table.c
+libknot/hash/cuckoo-hash-table.c
+libknot/hash/cuckoo-hash-table.h
+libknot/hash/hash-functions.c
+libknot/hash/hash-functions.h
+libknot/hash/universal-system.c
+libknot/hash/universal-system.h
 src/Makefile.am
 src/common/slab/malloc.c
 src/common/slab/malloc.h
@@ -42,98 +100,9 @@ src/common/crc.c
 src/common/crc.h
 src/common/ref.c
 src/common/ref.h
-src/dnslib/dnslib-common.h
-src/dnslib/dname.h
-src/dnslib/dname.c
-src/dnslib/rrset.h
-src/dnslib/rrset.c
-src/dnslib/dnslib-error.c
-src/dnslib/error.h
-src/dnslib/rdata.h
-src/dnslib/rdata.c
-src/dnslib/node.h
-src/dnslib/node.c
-src/dnslib/consts.h
-src/dnslib/descriptor.h
-src/dnslib/descriptor.c
-src/dnslib/zone.h
-src/dnslib/zone.c
-src/dnslib/packet.h
-src/dnslib/packet.c
-src/dnslib/query.h
-src/dnslib/query.c
-src/dnslib/response2.h
-src/dnslib/response2.c
-src/dnslib/response.h
-src/dnslib/wire.h
-src/dnslib/response.c
-src/dnslib/edns.h
-src/dnslib/edns.c
-src/dnslib/utils.h
-src/dnslib/utils.c
-src/dnslib/zonedb.h
-src/dnslib/zonedb.c
-src/dnslib/debug.h
-src/dnslib/debug.c
-src/dnslib/dnslib.h
-src/dnslib/tolower.h
-src/dnslib/tolower.c
-src/dnslib/nsec3.h
-src/dnslib/nsec3.c
-src/dnslib/changesets.h
-src/dnslib/changesets.c
-src/dnslib/zone-contents.c
-src/dnslib/zone-contents.h
-src/dnslib/zone-tree.h
-src/dnslib/zone-tree.c
-src/dnslib/xfr-in.h
-src/dnslib/xfr-in.c
-src/dnslib/name-server.c
-src/dnslib/name-server.h
-src/dnslib/hash/cuckoo-hash-table.c
-src/dnslib/hash/cuckoo-hash-table.h
-src/dnslib/hash/hash-functions.c
-src/dnslib/hash/hash-functions.h
-src/dnslib/hash/universal-system.c
-src/dnslib/hash/universal-system.h
-src/dnslib/tests/dnslib/dname_tests.c
-src/dnslib/tests/dnslib/dname_tests.h
-src/dnslib/tests/dnslib/edns_tests.c
-src/dnslib/tests/dnslib/edns_tests.h
-src/dnslib/tests/dnslib/node_tests.c
-src/dnslib/tests/dnslib/node_tests.h
-src/dnslib/tests/dnslib/rdata_tests.c
-src/dnslib/tests/dnslib/rdata_tests.h
-src/dnslib/tests/dnslib/response_tests.c
-src/dnslib/tests/dnslib/response_tests.h
-src/dnslib/tests/dnslib/rrset_tests.c
-src/dnslib/tests/dnslib/rrset_tests.h
-src/dnslib/tests/dnslib/zone_tests.c
-src/dnslib/tests/dnslib/zone_tests.h
-src/dnslib/tests/dnslib/zonedb_tests.c
-src/dnslib/tests/dnslib/zonedb_tests.h
-src/dnslib/tests/dnslib/cuckoo_tests.c
-src/dnslib/tests/dnslib/cuckoo_tests.h
-src/dnslib/tests/unittests_dnslib.c
-src/dnslib/tests/realdata/dnslib/dname_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/dname_tests_realdata.h
-src/dnslib/tests/realdata/dnslib/edns_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/edns_tests_realdata.h
-src/dnslib/tests/realdata/dnslib/node_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/node_tests_realdata.h
-src/dnslib/tests/realdata/dnslib/rdata_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/rdata_tests_realdata.h
-src/dnslib/tests/realdata/dnslib/response_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/response_tests_realdata.h
-src/dnslib/tests/realdata/dnslib/rrset_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/rrset_tests_realdata.h
-src/dnslib/tests/realdata/dnslib/zone_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/zone_tests_realdata.h
-src/dnslib/tests/realdata/dnslib/zonedb_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/zonedb_tests_realdata.h
-src/dnslib/tests/realdata/dnslib_tests_loader_realdata.c
-src/dnslib/tests/realdata/dnslib_tests_loader_realdata.h
-src/dnslib/tests/realdata/unittests_dnslib_realdata.c
+src/common/modified_tree.h
+src/common/general-tree.h
+src/common/general-tree.c
 src/zcompile/parser-descriptor.h
 src/zcompile/parser-descriptor.c
 src/zcompile/parser-util.h
@@ -191,6 +160,10 @@ src/knot/zone/zone-load.c
 src/knot/zone/zone-load.h
 src/knot/zone/zone-dump-text.h
 src/knot/zone/zone-dump-text.c
+src/zcompile/tests/unittests_zp_main.c
+src/zcompile/tests/zcompile_tests.c
+src/zcompile/zcompile-error.c
+src/tests/unittests_main.c
 src/tests/common/acl_tests.c
 src/tests/common/acl_tests.h
 src/tests/common/da_tests.c
@@ -209,27 +182,55 @@ src/tests/knot/journal_tests.c
 src/tests/knot/journal_tests.h
 src/tests/knot/server_tests.c
 src/tests/knot/server_tests.h
-src/tests/unittests_main.c
-tests/querytcp.c
-src/zcompile/tests/unittests_zp_main.c
-src/zcompile/tests/zcompile_tests.c
-src/zcompile/zcompile-error.c
-src/dnslib/dname-table.h
-src/dnslib/dname-table.c
-src/common/general-tree.h
-src/common/general-tree.c
-src/dnslib/tests/dnslib/dname_table_tests.h
-src/dnslib/tests/dnslib/dname_table_tests.c
-src/dnslib/tests/dnslib/packet_tests.c
-src/dnslib/tests/dnslib/packet_tests.h
-src/dnslib/tests/realdata/dnslib/packet_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/packet_tests_realdata.h
-src/dnslib/tests/dnslib/response2_tests.c
-src/dnslib/tests/dnslib/response2_tests.h
-src/dnslib/tests/realdata/dnslib/response2_tests_realdata.c
-src/dnslib/tests/realdata/dnslib/response2_tests_realdata.h
-src/dnslib/tests/dnslib/query_tests.c
-src/dnslib/tests/dnslib/query_tests.h
-src/dnslib/tests/dnslib/nsec3_tests.c
-src/dnslib/tests/dnslib/nsec3_tests.h
-src/common/modified_tree.h
+src/tests/libknot/libknot/unittests_dnslib.c
+src/tests/libknot/libknot/dname_tests.c
+src/tests/libknot/libknot/dname_tests.h
+src/tests/libknot/libknot/edns_tests.c
+src/tests/libknot/libknot/edns_tests.h
+src/tests/libknot/libknot/node_tests.c
+src/tests/libknot/libknot/node_tests.h
+src/tests/libknot/libknot/rdata_tests.c
+src/tests/libknot/libknot/rdata_tests.h
+src/tests/libknot/libknot/response_tests.c
+src/tests/libknot/libknot/response_tests.h
+src/tests/libknot/libknot/rrset_tests.c
+src/tests/libknot/libknot/rrset_tests.h
+src/tests/libknot/libknot/zone_tests.c
+src/tests/libknot/libknot/zone_tests.h
+src/tests/libknot/libknot/zonedb_tests.c
+src/tests/libknot/libknot/zonedb_tests.h
+src/tests/libknot/libknot/cuckoo_tests.c
+src/tests/libknot/libknot/cuckoo_tests.h
+src/tests/libknot/libknot/dname_table_tests.h
+src/tests/libknot/libknot/dname_table_tests.c
+src/tests/libknot/libknot/packet_tests.c
+src/tests/libknot/libknot/packet_tests.h
+src/tests/libknot/libknot/response2_tests.c
+src/tests/libknot/libknot/response2_tests.h
+src/tests/libknot/libknot/query_tests.c
+src/tests/libknot/libknot/query_tests.h
+src/tests/libknot/libknot/nsec3_tests.c
+src/tests/libknot/libknot/nsec3_tests.h
+src/tests/libknot/realdata/unittests_dnslib_realdata.c
+src/tests/libknot/realdata/libknot/packet_tests_realdata.c
+src/tests/libknot/realdata/libknot/packet_tests_realdata.h
+src/tests/libknot/realdata/libknot/response2_tests_realdata.c
+src/tests/libknot/realdata/libknot/response2_tests_realdata.h
+src/tests/libknot/realdata/libknot/dname_tests_realdata.c
+src/tests/libknot/realdata/libknot/dname_tests_realdata.h
+src/tests/libknot/realdata/libknot/edns_tests_realdata.c
+src/tests/libknot/realdata/libknot/edns_tests_realdata.h
+src/tests/libknot/realdata/libknot/node_tests_realdata.c
+src/tests/libknot/realdata/libknot/node_tests_realdata.h
+src/tests/libknot/realdata/libknot/rdata_tests_realdata.c
+src/tests/libknot/realdata/libknot/rdata_tests_realdata.h
+src/tests/libknot/realdata/libknot/response_tests_realdata.c
+src/tests/libknot/realdata/libknot/response_tests_realdata.h
+src/tests/libknot/realdata/libknot/rrset_tests_realdata.c
+src/tests/libknot/realdata/libknot/rrset_tests_realdata.h
+src/tests/libknot/realdata/libknot/zone_tests_realdata.c
+src/tests/libknot/realdata/libknot/zone_tests_realdata.h
+src/tests/libknot/realdata/libknot/zonedb_tests_realdata.c
+src/tests/libknot/realdata/libknot/zonedb_tests_realdata.h
+src/tests/libknot/realdata/libknot_tests_loader_realdata.c
+src/tests/libknot/realdata/libknot_tests_loader_realdata.h