diff --git a/Knot.files b/Knot.files
index 0c4e42ae312993d68e90088db724aa81a52b2be7..6b47c404dbe3e385ed83158a2c3500356fc8921b 100644
--- a/Knot.files
+++ b/Knot.files
@@ -2,60 +2,27 @@ Doxy.page.h
 CodingStyle
 Makefile.am
 src/Makefile.am
-obj/zlexer.c
-obj/zparser.c
-obj/zparser.h
-src/alloc/malloc.c
-src/alloc/malloc.h
-src/alloc/slab.c
-src/alloc/slab.h
-src/common.h
-src/ctl/knotc_main.c
-src/ctl/process.c
-src/ctl/process.h
-src/hash/cuckoo-hash-table.c
-src/hash/cuckoo-hash-table.h
-src/hash/hash-functions.c
-src/hash/hash-functions.h
-src/hash/universal-system.c
-src/hash/universal-system.h
-src/lib/bitset.c
-src/lib/bitset.h
-src/lib/dynamic-array.c
-src/lib/dynamic-array.h
-src/lib/skip-list.c
-src/lib/skip-list.h
-src/lib/tree.h
-src/lib/lists.h
-src/lib/lists.c
-src/lib/base32.h
-src/lib/base32.c
-src/lib/base32hex.h
-src/lib/base32hex.c
-src/main.c
-src/other/debug.h
-src/other/log.c
-src/other/log.h
-src/other/print.c
-src/other/print.h
-src/other/latency.c
-src/other/latency.h
-src/server/dthreads.c
-src/server/dthreads.h
-src/server/name-server.c
-src/server/name-server.h
-src/server/server.c
-src/server/server.h
-src/server/socket.c
-src/server/socket.h
-src/server/tcp-handler.c
-src/server/tcp-handler.h
-src/server/udp-handler.c
-src/server/udp-handler.h
-src/stat/gatherer.c
-src/stat/gatherer.h
-src/stat/stat.h
-src/stat/stat.c
+src/common/slab/malloc.c
+src/common/slab/malloc.h
+src/common/slab/slab.c
+src/common/slab/slab.h
+src/common/slab/alloc-common.h
+src/common/lists.h
+src/common/lists.c
+src/common/base32.h
+src/common/base32.c
+src/common/print.c
+src/common/print.h
+src/common/latency.c
+src/common/latency.h
+src/common/dynamic-array.c
+src/common/dynamic-array.h
+src/common/skip-list.c
+src/common/skip-list.h
+src/common/tree.h
+src/common/base32hex.h
+src/common/base32hex.c
+src/dnslib/dnslib-common.h
 src/dnslib/dname.h
 src/dnslib/dname.c
 src/dnslib/rrset.h
@@ -74,8 +41,6 @@ src/dnslib/packet.h
 src/dnslib/response.c
 src/dnslib/edns.h
 src/dnslib/edns.c
-src/dnslib/error.h
-src/dnslib/error.c
 src/dnslib/utils.h
 src/dnslib/utils.c
 src/dnslib/zonedb.h
@@ -84,7 +49,6 @@ 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/zone-dump.c
@@ -93,6 +57,12 @@ src/dnslib/zone-load.c
 src/dnslib/zone-load.h
 src/dnslib/zone-dump-text.h
 src/dnslib/zone-dump-text.c
+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/zoneparser/zoneparser_main.c
 src/zoneparser/parser-descriptor.h
 src/zoneparser/parser-descriptor.c
@@ -101,6 +71,40 @@ src/zoneparser/parser-util.c
 src/zoneparser/zoneparser.c
 src/zoneparser/zoneparser.h
 src/zoneparser/zparser.y
+src/zoneparser/zlexer.l
+src/knot/common.h
+src/knot/main.c
+src/knot/ctl/knotc_main.c
+src/knot/ctl/process.c
+src/knot/ctl/process.h
+src/knot/other/debug.h
+src/knot/other/log.c
+src/knot/other/log.h
+src/knot/stat/gatherer.c
+src/knot/stat/gatherer.h
+src/knot/stat/stat.h
+src/knot/stat/stat.c
+src/knot/stat/stat-common.h
+src/knot/server/dthreads.c
+src/knot/server/dthreads.h
+src/knot/server/name-server.c
+src/knot/server/name-server.h
+src/knot/server/server.c
+src/knot/server/server.h
+src/knot/server/socket.c
+src/knot/server/socket.h
+src/knot/server/tcp-handler.c
+src/knot/server/tcp-handler.h
+src/knot/server/udp-handler.c
+src/knot/server/udp-handler.h
+src/knot/ctl/process.c
+src/knot/ctl/process.h
+src/knot/conf/cf-lex.l
+src/knot/conf/cf-parse.y
+src/knot/conf/conf.c
+src/knot/conf/conf.h
+src/knot/conf/logconf.c
+src/knot/conf/logconf.h
 src/tests/conf_tests.c
 src/tests/cuckoo_tests.c
 src/tests/da_tests.c
@@ -129,14 +133,9 @@ src/tests/dnslib/dnslib_rdata_tests.c
 src/tests/dnslib/dnslib_rrset_tests.c
 src/tests/dnslib/dnslib_node_tests.c
 src/tests/dnslib/dnslib_response_tests.c
+src/tests/dnslib/dnslib_rrsig_set_tests.c
 src/tests/dnslib/dnslib_zone_tests.c
 src/tests/dnslib/dnslib_edns_tests.c
-src/conf/cf-lex.l
-src/conf/cf-parse.y
-src/conf/conf.c
-src/conf/conf.h
-src/conf/logconf.c
-src/conf/logconf.h
 tests/querytcp.c
 src/zoneparser/tests/unittests_zp_main.c
 src/zoneparser/tests/zcompile_tests.c