diff --git a/ORG-HASHQ b/data/aut-num/AS4242420208
similarity index 55%
rename from ORG-HASHQ
rename to data/aut-num/AS4242420208
index 0e0ed5366..10bf3cb03 100644
--- a/ORG-HASHQ
+++ b/data/aut-num/AS4242420208
@@ -1,6 +1,5 @@
-organisation:       ORG-HASHQ
-org-name:           HashQ
-e-mail:             HashQ@meretrix.net
+aut-num:            AS4242420208
+as-name:            HASHQ-AS
 admin-c:            HASHQ-DN42
 tech-c:             HASHQ-DN42
 mnt-by:             HASHQ-MNT
diff --git a/fd42:c0de:ca7::_48 b/data/inet6num/fd42:c0de:ca7::_48
similarity index 100%
rename from fd42:c0de:ca7::_48
rename to data/inet6num/fd42:c0de:ca7::_48
diff --git a/172.21.125.0_27 b/data/inetnum/172.21.125.0_27
similarity index 81%
rename from 172.21.125.0_27
rename to data/inetnum/172.21.125.0_27
index 13336117f..3d4c88260 100644
--- a/172.21.125.0_27
+++ b/data/inetnum/172.21.125.0_27
@@ -5,8 +5,6 @@ country:            DE
 admin-c:            HASHQ-DN42
 tech-c:             HASHQ-DN42
 mnt-by:             HASHQ-MNT
-nserver:            ns1.hashq.dn42
-nserver:            ns2.hashq.dn42
 status:             ASSIGNED
 cidr:               172.21.125.0/27
 source:             DN42
diff --git a/HASHQ-MNT b/data/mntner/HASHQ-MNT
similarity index 100%
rename from HASHQ-MNT
rename to data/mntner/HASHQ-MNT
diff --git a/HASHQ-DN42 b/data/person/HASHQ-DN42
similarity index 100%
rename from HASHQ-DN42
rename to data/person/HASHQ-DN42
diff --git a/data/route/172.21.125.0_27 b/data/route/172.21.125.0_27
new file mode 100644
index 000000000..9e9077956
--- /dev/null
+++ b/data/route/172.21.125.0_27
@@ -0,0 +1,4 @@
+route:              172.21.125.0/27
+origin:             AS4242420208
+mnt-by:             HASHQ-MNT
+source:             DN42
diff --git a/data/route6/fd42:c0de:ca7::_48 b/data/route6/fd42:c0de:ca7::_48
new file mode 100644
index 000000000..e144380fd
--- /dev/null
+++ b/data/route6/fd42:c0de:ca7::_48
@@ -0,0 +1,4 @@
+route6:             fd42:c0de:ca7::/48
+origin:             AS4242420208
+mnt-by:             HASHQ-MNT
+source:             DN42