diff --git a/Makefile.am b/Makefile.am
index 58685eef49e232f5e3d59c5ff82b463876748310..d64e06b233246664b8615156b223bedfe1bbbd09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libtap src/zscanner dnssec src tests samples doc man patches
+SUBDIRS = libtap src tests samples doc man patches
 
 AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-code-coverage
@@ -10,8 +10,8 @@ CODE_COVERAGE_DIRS =	\
 	src/knot	\
 	src/libknot	\
 	src/zscanner	\
-	dnssec/lib	\
-	dnssec/shared
+	src/dnssec/lib	\
+	src/dnssec/shared
 
 code_coverage_quiet = --quiet
 
diff --git a/configure.ac b/configure.ac
index 64a7119c816f0119f5d72f06b524afaf09cf3ea5..bf256eb9f155d329768427175bdafa8668b895d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -433,12 +433,12 @@ AC_CONFIG_FILES([Makefile
 		 tests/Makefile
 		 src/dnstap/Makefile
 		 src/zscanner/Makefile
-		 dnssec/Makefile
-		 dnssec/man/Makefile
-		 dnssec/man/keymgr.8
-		 dnssec/man/knsec3hash.1
-		 dnssec/tests/Makefile
-		 dnssec/utils/Makefile
+		 src/dnssec/Makefile
+		 src/dnssec/man/Makefile
+		 src/dnssec/man/keymgr.8
+		 src/dnssec/man/knsec3hash.1
+		 src/dnssec/tests/Makefile
+		 src/dnssec/utils/Makefile
 		 doc/conf.py
 		 man/khost.1
 		 man/knotc.8
diff --git a/src/Makefile.am b/src/Makefile.am
index 4fbacf2b564996107a231a5df6c55d8d773b5411..f7bd48ab4fabe488ea5f8f589d6879e0daed24c0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I $(top_srcdir)/m4
-SUBDIRS = dnstap .
+SUBDIRS = zscanner dnssec dnstap .
 
 lib_LTLIBRARIES = libknot-int.la libknot.la
 noinst_LTLIBRARIES =
@@ -20,7 +20,7 @@ AM_CPPFLAGS = \
 	-DCONFIG_DIR='"${config_dir}"'		\
 	-DSTORAGE_DIR='"${storage_dir}"'	\
 	-DRUN_DIR='"${run_dir}"'		\
-	-I$(top_srcdir)/dnssec/lib
+	-I$(srcdir)/dnssec/lib
 
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
@@ -360,7 +360,7 @@ libknot_int_la_LDFLAGS = $(AM_LDFLAGS) $(RELEASE_INFO) $(VERSION_INFO) $(lmdb_LI
 
 libknot_la_CPPFLAGS = $(AM_CPPFLAGS)
 libknot_la_LDFLAGS = $(AM_LDFLAGS) $(RELEASE_INFO) $(VERSION_INFO)
-libknot_la_LIBADD  = libknot-int.la ../dnssec/libdnssec.la zscanner/libzscanner.la
+libknot_la_LIBADD  = libknot-int.la dnssec/libdnssec.la zscanner/libzscanner.la
 
 if HAVE_DAEMON
 
@@ -389,7 +389,7 @@ endif # HAVE_DAEMON
 if HAVE_UTILS
 
 # bin programs
-BIN_LIBS = ../dnssec/libdnssec.la libknot.la libknot-int.la libknotus.la
+BIN_LIBS = dnssec/libdnssec.la libknot.la libknot-int.la libknotus.la
 kdig_LDADD       = $(BIN_LIBS) $(libidn_LIBS)
 khost_LDADD      = $(BIN_LIBS) $(libidn_LIBS)
 knsupdate_LDADD  = $(BIN_LIBS) zscanner/libzscanner.la
diff --git a/dnssec/.gitignore b/src/dnssec/.gitignore
similarity index 100%
rename from dnssec/.gitignore
rename to src/dnssec/.gitignore
diff --git a/dnssec/AUTHORS b/src/dnssec/AUTHORS
similarity index 100%
rename from dnssec/AUTHORS
rename to src/dnssec/AUTHORS
diff --git a/dnssec/COPYING b/src/dnssec/COPYING
similarity index 100%
rename from dnssec/COPYING
rename to src/dnssec/COPYING
diff --git a/dnssec/ChangeLog b/src/dnssec/ChangeLog
similarity index 100%
rename from dnssec/ChangeLog
rename to src/dnssec/ChangeLog
diff --git a/dnssec/Doxyfile b/src/dnssec/Doxyfile
similarity index 100%
rename from dnssec/Doxyfile
rename to src/dnssec/Doxyfile
diff --git a/dnssec/DoxygenLayout.xml b/src/dnssec/DoxygenLayout.xml
similarity index 100%
rename from dnssec/DoxygenLayout.xml
rename to src/dnssec/DoxygenLayout.xml
diff --git a/dnssec/INSTALL b/src/dnssec/INSTALL
similarity index 100%
rename from dnssec/INSTALL
rename to src/dnssec/INSTALL
diff --git a/dnssec/Makefile.am b/src/dnssec/Makefile.am
similarity index 100%
rename from dnssec/Makefile.am
rename to src/dnssec/Makefile.am
diff --git a/dnssec/NEWS b/src/dnssec/NEWS
similarity index 100%
rename from dnssec/NEWS
rename to src/dnssec/NEWS
diff --git a/dnssec/README b/src/dnssec/README
similarity index 100%
rename from dnssec/README
rename to src/dnssec/README
diff --git a/dnssec/contrib/convert-keys.sh b/src/dnssec/contrib/convert-keys.sh
similarity index 100%
rename from dnssec/contrib/convert-keys.sh
rename to src/dnssec/contrib/convert-keys.sh
diff --git a/dnssec/contrib/gnutls_error.c b/src/dnssec/contrib/gnutls_error.c
similarity index 100%
rename from dnssec/contrib/gnutls_error.c
rename to src/dnssec/contrib/gnutls_error.c
diff --git a/dnssec/contrib/template.json b/src/dnssec/contrib/template.json
similarity index 100%
rename from dnssec/contrib/template.json
rename to src/dnssec/contrib/template.json
diff --git a/dnssec/doc/api.md b/src/dnssec/doc/api.md
similarity index 100%
rename from dnssec/doc/api.md
rename to src/dnssec/doc/api.md
diff --git a/dnssec/doc/coding.md b/src/dnssec/doc/coding.md
similarity index 100%
rename from dnssec/doc/coding.md
rename to src/dnssec/doc/coding.md
diff --git a/dnssec/lib/binary.c b/src/dnssec/lib/binary.c
similarity index 100%
rename from dnssec/lib/binary.c
rename to src/dnssec/lib/binary.c
diff --git a/dnssec/lib/crypto.c b/src/dnssec/lib/crypto.c
similarity index 100%
rename from dnssec/lib/crypto.c
rename to src/dnssec/lib/crypto.c
diff --git a/dnssec/lib/dnssec/binary.h b/src/dnssec/lib/dnssec/binary.h
similarity index 100%
rename from dnssec/lib/dnssec/binary.h
rename to src/dnssec/lib/dnssec/binary.h
diff --git a/dnssec/lib/dnssec/crypto.h b/src/dnssec/lib/dnssec/crypto.h
similarity index 100%
rename from dnssec/lib/dnssec/crypto.h
rename to src/dnssec/lib/dnssec/crypto.h
diff --git a/dnssec/lib/dnssec/dnssec.h b/src/dnssec/lib/dnssec/dnssec.h
similarity index 100%
rename from dnssec/lib/dnssec/dnssec.h
rename to src/dnssec/lib/dnssec/dnssec.h
diff --git a/dnssec/lib/dnssec/error.h b/src/dnssec/lib/dnssec/error.h
similarity index 100%
rename from dnssec/lib/dnssec/error.h
rename to src/dnssec/lib/dnssec/error.h
diff --git a/dnssec/lib/dnssec/event.h b/src/dnssec/lib/dnssec/event.h
similarity index 100%
rename from dnssec/lib/dnssec/event.h
rename to src/dnssec/lib/dnssec/event.h
diff --git a/dnssec/lib/dnssec/kasp.h b/src/dnssec/lib/dnssec/kasp.h
similarity index 100%
rename from dnssec/lib/dnssec/kasp.h
rename to src/dnssec/lib/dnssec/kasp.h
diff --git a/dnssec/lib/dnssec/key.h b/src/dnssec/lib/dnssec/key.h
similarity index 100%
rename from dnssec/lib/dnssec/key.h
rename to src/dnssec/lib/dnssec/key.h
diff --git a/dnssec/lib/dnssec/keyid.h b/src/dnssec/lib/dnssec/keyid.h
similarity index 100%
rename from dnssec/lib/dnssec/keyid.h
rename to src/dnssec/lib/dnssec/keyid.h
diff --git a/dnssec/lib/dnssec/keystore.h b/src/dnssec/lib/dnssec/keystore.h
similarity index 100%
rename from dnssec/lib/dnssec/keystore.h
rename to src/dnssec/lib/dnssec/keystore.h
diff --git a/dnssec/lib/dnssec/keytag.h b/src/dnssec/lib/dnssec/keytag.h
similarity index 100%
rename from dnssec/lib/dnssec/keytag.h
rename to src/dnssec/lib/dnssec/keytag.h
diff --git a/dnssec/lib/dnssec/list.h b/src/dnssec/lib/dnssec/list.h
similarity index 100%
rename from dnssec/lib/dnssec/list.h
rename to src/dnssec/lib/dnssec/list.h
diff --git a/dnssec/lib/dnssec/nsec.h b/src/dnssec/lib/dnssec/nsec.h
similarity index 100%
rename from dnssec/lib/dnssec/nsec.h
rename to src/dnssec/lib/dnssec/nsec.h
diff --git a/dnssec/lib/dnssec/random.h b/src/dnssec/lib/dnssec/random.h
similarity index 100%
rename from dnssec/lib/dnssec/random.h
rename to src/dnssec/lib/dnssec/random.h
diff --git a/dnssec/lib/dnssec/sign.h b/src/dnssec/lib/dnssec/sign.h
similarity index 100%
rename from dnssec/lib/dnssec/sign.h
rename to src/dnssec/lib/dnssec/sign.h
diff --git a/dnssec/lib/dnssec/tsig.h b/src/dnssec/lib/dnssec/tsig.h
similarity index 100%
rename from dnssec/lib/dnssec/tsig.h
rename to src/dnssec/lib/dnssec/tsig.h
diff --git a/dnssec/lib/error.c b/src/dnssec/lib/error.c
similarity index 100%
rename from dnssec/lib/error.c
rename to src/dnssec/lib/error.c
diff --git a/dnssec/lib/event/action.h b/src/dnssec/lib/event/action.h
similarity index 100%
rename from dnssec/lib/event/action.h
rename to src/dnssec/lib/event/action.h
diff --git a/dnssec/lib/event/action/initial_key.c b/src/dnssec/lib/event/action/initial_key.c
similarity index 100%
rename from dnssec/lib/event/action/initial_key.c
rename to src/dnssec/lib/event/action/initial_key.c
diff --git a/dnssec/lib/event/action/zsk_rollover.c b/src/dnssec/lib/event/action/zsk_rollover.c
similarity index 100%
rename from dnssec/lib/event/action/zsk_rollover.c
rename to src/dnssec/lib/event/action/zsk_rollover.c
diff --git a/dnssec/lib/event/event.c b/src/dnssec/lib/event/event.c
similarity index 100%
rename from dnssec/lib/event/event.c
rename to src/dnssec/lib/event/event.c
diff --git a/dnssec/lib/event/keystate.c b/src/dnssec/lib/event/keystate.c
similarity index 100%
rename from dnssec/lib/event/keystate.c
rename to src/dnssec/lib/event/keystate.c
diff --git a/dnssec/lib/event/keystate.h b/src/dnssec/lib/event/keystate.h
similarity index 100%
rename from dnssec/lib/event/keystate.h
rename to src/dnssec/lib/event/keystate.h
diff --git a/dnssec/lib/event/utils.c b/src/dnssec/lib/event/utils.c
similarity index 100%
rename from dnssec/lib/event/utils.c
rename to src/dnssec/lib/event/utils.c
diff --git a/dnssec/lib/event/utils.h b/src/dnssec/lib/event/utils.h
similarity index 100%
rename from dnssec/lib/event/utils.h
rename to src/dnssec/lib/event/utils.h
diff --git a/dnssec/lib/kasp/dir/dir.c b/src/dnssec/lib/kasp/dir/dir.c
similarity index 100%
rename from dnssec/lib/kasp/dir/dir.c
rename to src/dnssec/lib/kasp/dir/dir.c
diff --git a/dnssec/lib/kasp/dir/escape.c b/src/dnssec/lib/kasp/dir/escape.c
similarity index 100%
rename from dnssec/lib/kasp/dir/escape.c
rename to src/dnssec/lib/kasp/dir/escape.c
diff --git a/dnssec/lib/kasp/dir/escape.h b/src/dnssec/lib/kasp/dir/escape.h
similarity index 100%
rename from dnssec/lib/kasp/dir/escape.h
rename to src/dnssec/lib/kasp/dir/escape.h
diff --git a/dnssec/lib/kasp/dir/file.c b/src/dnssec/lib/kasp/dir/file.c
similarity index 100%
rename from dnssec/lib/kasp/dir/file.c
rename to src/dnssec/lib/kasp/dir/file.c
diff --git a/dnssec/lib/kasp/dir/file.h b/src/dnssec/lib/kasp/dir/file.h
similarity index 100%
rename from dnssec/lib/kasp/dir/file.h
rename to src/dnssec/lib/kasp/dir/file.h
diff --git a/dnssec/lib/kasp/dir/json.c b/src/dnssec/lib/kasp/dir/json.c
similarity index 100%
rename from dnssec/lib/kasp/dir/json.c
rename to src/dnssec/lib/kasp/dir/json.c
diff --git a/dnssec/lib/kasp/dir/json.h b/src/dnssec/lib/kasp/dir/json.h
similarity index 100%
rename from dnssec/lib/kasp/dir/json.h
rename to src/dnssec/lib/kasp/dir/json.h
diff --git a/dnssec/lib/kasp/dir/policy.c b/src/dnssec/lib/kasp/dir/policy.c
similarity index 100%
rename from dnssec/lib/kasp/dir/policy.c
rename to src/dnssec/lib/kasp/dir/policy.c
diff --git a/dnssec/lib/kasp/dir/policy.h b/src/dnssec/lib/kasp/dir/policy.h
similarity index 100%
rename from dnssec/lib/kasp/dir/policy.h
rename to src/dnssec/lib/kasp/dir/policy.h
diff --git a/dnssec/lib/kasp/dir/zone.c b/src/dnssec/lib/kasp/dir/zone.c
similarity index 100%
rename from dnssec/lib/kasp/dir/zone.c
rename to src/dnssec/lib/kasp/dir/zone.c
diff --git a/dnssec/lib/kasp/dir/zone.h b/src/dnssec/lib/kasp/dir/zone.h
similarity index 100%
rename from dnssec/lib/kasp/dir/zone.h
rename to src/dnssec/lib/kasp/dir/zone.h
diff --git a/dnssec/lib/kasp/internal.h b/src/dnssec/lib/kasp/internal.h
similarity index 100%
rename from dnssec/lib/kasp/internal.h
rename to src/dnssec/lib/kasp/internal.h
diff --git a/dnssec/lib/kasp/kasp.c b/src/dnssec/lib/kasp/kasp.c
similarity index 100%
rename from dnssec/lib/kasp/kasp.c
rename to src/dnssec/lib/kasp/kasp.c
diff --git a/dnssec/lib/kasp/policy.c b/src/dnssec/lib/kasp/policy.c
similarity index 100%
rename from dnssec/lib/kasp/policy.c
rename to src/dnssec/lib/kasp/policy.c
diff --git a/dnssec/lib/kasp/zone.c b/src/dnssec/lib/kasp/zone.c
similarity index 100%
rename from dnssec/lib/kasp/zone.c
rename to src/dnssec/lib/kasp/zone.c
diff --git a/dnssec/lib/kasp/zone.h b/src/dnssec/lib/kasp/zone.h
similarity index 100%
rename from dnssec/lib/kasp/zone.h
rename to src/dnssec/lib/kasp/zone.h
diff --git a/dnssec/lib/key/algorithm.c b/src/dnssec/lib/key/algorithm.c
similarity index 100%
rename from dnssec/lib/key/algorithm.c
rename to src/dnssec/lib/key/algorithm.c
diff --git a/dnssec/lib/key/algorithm.h b/src/dnssec/lib/key/algorithm.h
similarity index 100%
rename from dnssec/lib/key/algorithm.h
rename to src/dnssec/lib/key/algorithm.h
diff --git a/dnssec/lib/key/convert.c b/src/dnssec/lib/key/convert.c
similarity index 100%
rename from dnssec/lib/key/convert.c
rename to src/dnssec/lib/key/convert.c
diff --git a/dnssec/lib/key/convert.h b/src/dnssec/lib/key/convert.h
similarity index 100%
rename from dnssec/lib/key/convert.h
rename to src/dnssec/lib/key/convert.h
diff --git a/dnssec/lib/key/dnskey.c b/src/dnssec/lib/key/dnskey.c
similarity index 100%
rename from dnssec/lib/key/dnskey.c
rename to src/dnssec/lib/key/dnskey.c
diff --git a/dnssec/lib/key/dnskey.h b/src/dnssec/lib/key/dnskey.h
similarity index 100%
rename from dnssec/lib/key/dnskey.h
rename to src/dnssec/lib/key/dnskey.h
diff --git a/dnssec/lib/key/ds.c b/src/dnssec/lib/key/ds.c
similarity index 100%
rename from dnssec/lib/key/ds.c
rename to src/dnssec/lib/key/ds.c
diff --git a/dnssec/lib/key/internal.h b/src/dnssec/lib/key/internal.h
similarity index 100%
rename from dnssec/lib/key/internal.h
rename to src/dnssec/lib/key/internal.h
diff --git a/dnssec/lib/key/key.c b/src/dnssec/lib/key/key.c
similarity index 100%
rename from dnssec/lib/key/key.c
rename to src/dnssec/lib/key/key.c
diff --git a/dnssec/lib/key/keytag.c b/src/dnssec/lib/key/keytag.c
similarity index 100%
rename from dnssec/lib/key/keytag.c
rename to src/dnssec/lib/key/keytag.c
diff --git a/dnssec/lib/key/privkey.c b/src/dnssec/lib/key/privkey.c
similarity index 100%
rename from dnssec/lib/key/privkey.c
rename to src/dnssec/lib/key/privkey.c
diff --git a/dnssec/lib/key/privkey.h b/src/dnssec/lib/key/privkey.h
similarity index 100%
rename from dnssec/lib/key/privkey.h
rename to src/dnssec/lib/key/privkey.h
diff --git a/dnssec/lib/key/simple.c b/src/dnssec/lib/key/simple.c
similarity index 100%
rename from dnssec/lib/key/simple.c
rename to src/dnssec/lib/key/simple.c
diff --git a/dnssec/lib/keyid.c b/src/dnssec/lib/keyid.c
similarity index 100%
rename from dnssec/lib/keyid.c
rename to src/dnssec/lib/keyid.c
diff --git a/dnssec/lib/keystore/internal.h b/src/dnssec/lib/keystore/internal.h
similarity index 100%
rename from dnssec/lib/keystore/internal.h
rename to src/dnssec/lib/keystore/internal.h
diff --git a/dnssec/lib/keystore/keystore.c b/src/dnssec/lib/keystore/keystore.c
similarity index 100%
rename from dnssec/lib/keystore/keystore.c
rename to src/dnssec/lib/keystore/keystore.c
diff --git a/dnssec/lib/keystore/pkcs11.c b/src/dnssec/lib/keystore/pkcs11.c
similarity index 100%
rename from dnssec/lib/keystore/pkcs11.c
rename to src/dnssec/lib/keystore/pkcs11.c
diff --git a/dnssec/lib/keystore/pkcs8.c b/src/dnssec/lib/keystore/pkcs8.c
similarity index 100%
rename from dnssec/lib/keystore/pkcs8.c
rename to src/dnssec/lib/keystore/pkcs8.c
diff --git a/dnssec/lib/keystore/pkcs8_dir.c b/src/dnssec/lib/keystore/pkcs8_dir.c
similarity index 100%
rename from dnssec/lib/keystore/pkcs8_dir.c
rename to src/dnssec/lib/keystore/pkcs8_dir.c
diff --git a/dnssec/lib/list/list.c b/src/dnssec/lib/list/list.c
similarity index 100%
rename from dnssec/lib/list/list.c
rename to src/dnssec/lib/list/list.c
diff --git a/dnssec/lib/list/ucw_clists.h b/src/dnssec/lib/list/ucw_clists.h
similarity index 100%
rename from dnssec/lib/list/ucw_clists.h
rename to src/dnssec/lib/list/ucw_clists.h
diff --git a/dnssec/lib/nsec/bitmap.c b/src/dnssec/lib/nsec/bitmap.c
similarity index 100%
rename from dnssec/lib/nsec/bitmap.c
rename to src/dnssec/lib/nsec/bitmap.c
diff --git a/dnssec/lib/nsec/hash.c b/src/dnssec/lib/nsec/hash.c
similarity index 100%
rename from dnssec/lib/nsec/hash.c
rename to src/dnssec/lib/nsec/hash.c
diff --git a/dnssec/lib/random.c b/src/dnssec/lib/random.c
similarity index 100%
rename from dnssec/lib/random.c
rename to src/dnssec/lib/random.c
diff --git a/dnssec/lib/sign/der.c b/src/dnssec/lib/sign/der.c
similarity index 100%
rename from dnssec/lib/sign/der.c
rename to src/dnssec/lib/sign/der.c
diff --git a/dnssec/lib/sign/der.h b/src/dnssec/lib/sign/der.h
similarity index 100%
rename from dnssec/lib/sign/der.h
rename to src/dnssec/lib/sign/der.h
diff --git a/dnssec/lib/sign/sign.c b/src/dnssec/lib/sign/sign.c
similarity index 100%
rename from dnssec/lib/sign/sign.c
rename to src/dnssec/lib/sign/sign.c
diff --git a/dnssec/lib/tsig.c b/src/dnssec/lib/tsig.c
similarity index 100%
rename from dnssec/lib/tsig.c
rename to src/dnssec/lib/tsig.c
diff --git a/dnssec/man/.gitignore b/src/dnssec/man/.gitignore
similarity index 100%
rename from dnssec/man/.gitignore
rename to src/dnssec/man/.gitignore
diff --git a/dnssec/man/Makefile.am b/src/dnssec/man/Makefile.am
similarity index 100%
rename from dnssec/man/Makefile.am
rename to src/dnssec/man/Makefile.am
diff --git a/dnssec/man/keymgr.8.in b/src/dnssec/man/keymgr.8.in
similarity index 100%
rename from dnssec/man/keymgr.8.in
rename to src/dnssec/man/keymgr.8.in
diff --git a/dnssec/man/knsec3hash.1.in b/src/dnssec/man/knsec3hash.1.in
similarity index 100%
rename from dnssec/man/knsec3hash.1.in
rename to src/dnssec/man/knsec3hash.1.in
diff --git a/dnssec/shared/base32hex.c b/src/dnssec/shared/base32hex.c
similarity index 100%
rename from dnssec/shared/base32hex.c
rename to src/dnssec/shared/base32hex.c
diff --git a/dnssec/shared/base32hex.h b/src/dnssec/shared/base32hex.h
similarity index 100%
rename from dnssec/shared/base32hex.h
rename to src/dnssec/shared/base32hex.h
diff --git a/dnssec/shared/dname.c b/src/dnssec/shared/dname.c
similarity index 100%
rename from dnssec/shared/dname.c
rename to src/dnssec/shared/dname.c
diff --git a/dnssec/shared/dname.h b/src/dnssec/shared/dname.h
similarity index 100%
rename from dnssec/shared/dname.h
rename to src/dnssec/shared/dname.h
diff --git a/dnssec/shared/fs.c b/src/dnssec/shared/fs.c
similarity index 100%
rename from dnssec/shared/fs.c
rename to src/dnssec/shared/fs.c
diff --git a/dnssec/shared/fs.h b/src/dnssec/shared/fs.h
similarity index 100%
rename from dnssec/shared/fs.h
rename to src/dnssec/shared/fs.h
diff --git a/dnssec/shared/hex.c b/src/dnssec/shared/hex.c
similarity index 100%
rename from dnssec/shared/hex.c
rename to src/dnssec/shared/hex.c
diff --git a/dnssec/shared/hex.h b/src/dnssec/shared/hex.h
similarity index 100%
rename from dnssec/shared/hex.h
rename to src/dnssec/shared/hex.h
diff --git a/dnssec/shared/hex_gnutls.c b/src/dnssec/shared/hex_gnutls.c
similarity index 100%
rename from dnssec/shared/hex_gnutls.c
rename to src/dnssec/shared/hex_gnutls.c
diff --git a/dnssec/shared/hex_gnutls.h b/src/dnssec/shared/hex_gnutls.h
similarity index 100%
rename from dnssec/shared/hex_gnutls.h
rename to src/dnssec/shared/hex_gnutls.h
diff --git a/dnssec/shared/path.c b/src/dnssec/shared/path.c
similarity index 100%
rename from dnssec/shared/path.c
rename to src/dnssec/shared/path.c
diff --git a/dnssec/shared/path.h b/src/dnssec/shared/path.h
similarity index 100%
rename from dnssec/shared/path.h
rename to src/dnssec/shared/path.h
diff --git a/dnssec/shared/pem.c b/src/dnssec/shared/pem.c
similarity index 100%
rename from dnssec/shared/pem.c
rename to src/dnssec/shared/pem.c
diff --git a/dnssec/shared/pem.h b/src/dnssec/shared/pem.h
similarity index 100%
rename from dnssec/shared/pem.h
rename to src/dnssec/shared/pem.h
diff --git a/dnssec/shared/shared.h b/src/dnssec/shared/shared.h
similarity index 100%
rename from dnssec/shared/shared.h
rename to src/dnssec/shared/shared.h
diff --git a/dnssec/shared/strtonum.h b/src/dnssec/shared/strtonum.h
similarity index 100%
rename from dnssec/shared/strtonum.h
rename to src/dnssec/shared/strtonum.h
diff --git a/dnssec/shared/wire.h b/src/dnssec/shared/wire.h
similarity index 100%
rename from dnssec/shared/wire.h
rename to src/dnssec/shared/wire.h
diff --git a/dnssec/tests/.gitignore b/src/dnssec/tests/.gitignore
similarity index 100%
rename from dnssec/tests/.gitignore
rename to src/dnssec/tests/.gitignore
diff --git a/dnssec/tests/Makefile.am b/src/dnssec/tests/Makefile.am
similarity index 100%
rename from dnssec/tests/Makefile.am
rename to src/dnssec/tests/Makefile.am
diff --git a/dnssec/tests/binary.c b/src/dnssec/tests/binary.c
similarity index 100%
rename from dnssec/tests/binary.c
rename to src/dnssec/tests/binary.c
diff --git a/dnssec/tests/crypto.c b/src/dnssec/tests/crypto.c
similarity index 100%
rename from dnssec/tests/crypto.c
rename to src/dnssec/tests/crypto.c
diff --git a/dnssec/tests/kasp_dir_escape.c b/src/dnssec/tests/kasp_dir_escape.c
similarity index 100%
rename from dnssec/tests/kasp_dir_escape.c
rename to src/dnssec/tests/kasp_dir_escape.c
diff --git a/dnssec/tests/kasp_dir_file.c b/src/dnssec/tests/kasp_dir_file.c
similarity index 100%
rename from dnssec/tests/kasp_dir_file.c
rename to src/dnssec/tests/kasp_dir_file.c
diff --git a/dnssec/tests/kasp_store.c b/src/dnssec/tests/kasp_store.c
similarity index 100%
rename from dnssec/tests/kasp_store.c
rename to src/dnssec/tests/kasp_store.c
diff --git a/dnssec/tests/key.c b/src/dnssec/tests/key.c
similarity index 100%
rename from dnssec/tests/key.c
rename to src/dnssec/tests/key.c
diff --git a/dnssec/tests/key_algorithm.c b/src/dnssec/tests/key_algorithm.c
similarity index 100%
rename from dnssec/tests/key_algorithm.c
rename to src/dnssec/tests/key_algorithm.c
diff --git a/dnssec/tests/keyid.c b/src/dnssec/tests/keyid.c
similarity index 100%
rename from dnssec/tests/keyid.c
rename to src/dnssec/tests/keyid.c
diff --git a/dnssec/tests/keystore_pkcs8.c b/src/dnssec/tests/keystore_pkcs8.c
similarity index 100%
rename from dnssec/tests/keystore_pkcs8.c
rename to src/dnssec/tests/keystore_pkcs8.c
diff --git a/dnssec/tests/keystore_pkcs8_dir.c b/src/dnssec/tests/keystore_pkcs8_dir.c
similarity index 100%
rename from dnssec/tests/keystore_pkcs8_dir.c
rename to src/dnssec/tests/keystore_pkcs8_dir.c
diff --git a/dnssec/tests/keytag.c b/src/dnssec/tests/keytag.c
similarity index 100%
rename from dnssec/tests/keytag.c
rename to src/dnssec/tests/keytag.c
diff --git a/dnssec/tests/list.c b/src/dnssec/tests/list.c
similarity index 100%
rename from dnssec/tests/list.c
rename to src/dnssec/tests/list.c
diff --git a/dnssec/tests/nsec_bitmap.c b/src/dnssec/tests/nsec_bitmap.c
similarity index 100%
rename from dnssec/tests/nsec_bitmap.c
rename to src/dnssec/tests/nsec_bitmap.c
diff --git a/dnssec/tests/nsec_hash.c b/src/dnssec/tests/nsec_hash.c
similarity index 100%
rename from dnssec/tests/nsec_hash.c
rename to src/dnssec/tests/nsec_hash.c
diff --git a/dnssec/tests/random.c b/src/dnssec/tests/random.c
similarity index 100%
rename from dnssec/tests/random.c
rename to src/dnssec/tests/random.c
diff --git a/dnssec/tests/sample_keys.h b/src/dnssec/tests/sample_keys.h
similarity index 100%
rename from dnssec/tests/sample_keys.h
rename to src/dnssec/tests/sample_keys.h
diff --git a/dnssec/tests/shared_base32hex.c b/src/dnssec/tests/shared_base32hex.c
similarity index 100%
rename from dnssec/tests/shared_base32hex.c
rename to src/dnssec/tests/shared_base32hex.c
diff --git a/dnssec/tests/shared_dname.c b/src/dnssec/tests/shared_dname.c
similarity index 100%
rename from dnssec/tests/shared_dname.c
rename to src/dnssec/tests/shared_dname.c
diff --git a/dnssec/tests/shared_wire.c b/src/dnssec/tests/shared_wire.c
similarity index 100%
rename from dnssec/tests/shared_wire.c
rename to src/dnssec/tests/shared_wire.c
diff --git a/dnssec/tests/sign.c b/src/dnssec/tests/sign.c
similarity index 100%
rename from dnssec/tests/sign.c
rename to src/dnssec/tests/sign.c
diff --git a/dnssec/tests/sign_der.c b/src/dnssec/tests/sign_der.c
similarity index 100%
rename from dnssec/tests/sign_der.c
rename to src/dnssec/tests/sign_der.c
diff --git a/dnssec/tests/tsig.c b/src/dnssec/tests/tsig.c
similarity index 100%
rename from dnssec/tests/tsig.c
rename to src/dnssec/tests/tsig.c
diff --git a/dnssec/utils/.gitignore b/src/dnssec/utils/.gitignore
similarity index 100%
rename from dnssec/utils/.gitignore
rename to src/dnssec/utils/.gitignore
diff --git a/dnssec/utils/Makefile.am b/src/dnssec/utils/Makefile.am
similarity index 100%
rename from dnssec/utils/Makefile.am
rename to src/dnssec/utils/Makefile.am
diff --git a/dnssec/utils/cmdparse/command.c b/src/dnssec/utils/cmdparse/command.c
similarity index 100%
rename from dnssec/utils/cmdparse/command.c
rename to src/dnssec/utils/cmdparse/command.c
diff --git a/dnssec/utils/cmdparse/command.h b/src/dnssec/utils/cmdparse/command.h
similarity index 100%
rename from dnssec/utils/cmdparse/command.h
rename to src/dnssec/utils/cmdparse/command.h
diff --git a/dnssec/utils/cmdparse/match.h b/src/dnssec/utils/cmdparse/match.h
similarity index 100%
rename from dnssec/utils/cmdparse/match.h
rename to src/dnssec/utils/cmdparse/match.h
diff --git a/dnssec/utils/cmdparse/parameter.c b/src/dnssec/utils/cmdparse/parameter.c
similarity index 100%
rename from dnssec/utils/cmdparse/parameter.c
rename to src/dnssec/utils/cmdparse/parameter.c
diff --git a/dnssec/utils/cmdparse/parameter.h b/src/dnssec/utils/cmdparse/parameter.h
similarity index 100%
rename from dnssec/utils/cmdparse/parameter.h
rename to src/dnssec/utils/cmdparse/parameter.h
diff --git a/dnssec/utils/cmdparse/value.c b/src/dnssec/utils/cmdparse/value.c
similarity index 100%
rename from dnssec/utils/cmdparse/value.c
rename to src/dnssec/utils/cmdparse/value.c
diff --git a/dnssec/utils/cmdparse/value.h b/src/dnssec/utils/cmdparse/value.h
similarity index 100%
rename from dnssec/utils/cmdparse/value.h
rename to src/dnssec/utils/cmdparse/value.h
diff --git a/dnssec/utils/keymgr.c b/src/dnssec/utils/keymgr.c
similarity index 100%
rename from dnssec/utils/keymgr.c
rename to src/dnssec/utils/keymgr.c
diff --git a/dnssec/utils/knsec3hash.c b/src/dnssec/utils/knsec3hash.c
similarity index 100%
rename from dnssec/utils/knsec3hash.c
rename to src/dnssec/utils/knsec3hash.c
diff --git a/dnssec/utils/legacy/key.c b/src/dnssec/utils/legacy/key.c
similarity index 100%
rename from dnssec/utils/legacy/key.c
rename to src/dnssec/utils/legacy/key.c
diff --git a/dnssec/utils/legacy/key.h b/src/dnssec/utils/legacy/key.h
similarity index 100%
rename from dnssec/utils/legacy/key.h
rename to src/dnssec/utils/legacy/key.h
diff --git a/dnssec/utils/legacy/privkey.c b/src/dnssec/utils/legacy/privkey.c
similarity index 100%
rename from dnssec/utils/legacy/privkey.c
rename to src/dnssec/utils/legacy/privkey.c
diff --git a/dnssec/utils/legacy/privkey.h b/src/dnssec/utils/legacy/privkey.h
similarity index 100%
rename from dnssec/utils/legacy/privkey.h
rename to src/dnssec/utils/legacy/privkey.h
diff --git a/dnssec/utils/legacy/pubkey.c b/src/dnssec/utils/legacy/pubkey.c
similarity index 100%
rename from dnssec/utils/legacy/pubkey.c
rename to src/dnssec/utils/legacy/pubkey.c
diff --git a/dnssec/utils/legacy/pubkey.h b/src/dnssec/utils/legacy/pubkey.h
similarity index 100%
rename from dnssec/utils/legacy/pubkey.h
rename to src/dnssec/utils/legacy/pubkey.h
diff --git a/dnssec/utils/print.h b/src/dnssec/utils/print.h
similarity index 100%
rename from dnssec/utils/print.h
rename to src/dnssec/utils/print.h