diff --git a/federated/funkwhale/address.md b/federated/funkwhale/address.md
deleted file mode 100644
index a0f682f..0000000
--- a/federated/funkwhale/address.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# FunkWhale
-
-## Personal
-
-```` https://open.audio/@stephenv/ ````
diff --git a/federated/funkwhale/address.md.asc b/federated/funkwhale/address.md.asc
deleted file mode 100644
index b386bda..0000000
--- a/federated/funkwhale/address.md.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-# FunkWhale
-
-## Personal
-
-```` https://open.audio/@stephenv/ ````
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCgAdFiEE8GHWJGiqDefDJ1S170Ke+EeGjBQFAmPXDaIACgkQ70Ke+EeG
-jBSvbg//TYJuUy0GtVijh2wGhrJBL/bBpmOYWqaWoCbf5G2xeKo5i8saEUoebSW2
-JNpGMvy2U2zjyKT7k39dIzeeP3t/hREg/1cJt/Ik2bqVreo+4P9J9ohFj3wpWqzO
-8U8BCjh62H7FM50Xk52txjyBvKi8Zz7CKC1xsHaPsbPhVzOrtTJaDeDZAjozztS1
-uXhb1OEIPeCekCp5FO4u+aPPW7fjTNwvY+rV38C/H4RC9DPz0xuhdIE9Z7vtCQc6
-lKzUy6CR8P8n9Z4DRJSu9JZwArz4aGbMo2Kl+IDy2VF3uJ25pIgE4NGoeETBs9Ae
-5KJf2W0b84rYXeoKxfZACQJofvPPHI3jF5D2Wb+eI7cetU+7+N9fUw0RvHYql60B
-AA6RN1Iw9HpjcXchu/z7a6bg7QXxBbRNLUfwFgJPdZyx/oJlJNBsG6QF9YPD9CTC
-UR3LrSl1f9Mx/eVsv8Um+TUB3hlocLMj1LwBjKio/wu1eUrKsFK5B0NXU/r7cAj2
-owE9vKiJvkTNPWN1tqxcPVuRj9ecgPMqe9CcSX8zwqsfCcGK6Lcs9G5TJ732YMO5
-oAxqrupP279P3gZtkuzLTDUpCoRaya/Rfq37HlhBOBZnZ5lwrp3+DDTSccu90pyc
-dfFothm4ACWY8hWfCkrj+pE+fpY/mpT48oel5JPzVjzsGdzXFVo=
-=DEQg
------END PGP SIGNATURE-----
diff --git a/federated/lemmy/address.md b/federated/lemmy/address.md
deleted file mode 100644
index f06c99e..0000000
--- a/federated/lemmy/address.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Lemmy
-
-## Personal
-
-```` https://lemmy.ml/u/stephen ````
diff --git a/federated/lemmy/address.md.asc b/federated/lemmy/address.md.asc
deleted file mode 100644
index 9a18677..0000000
--- a/federated/lemmy/address.md.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-# Lemmy
-
-## Personal
-
-```` https://lemmy.ml/u/stephen ````
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCgAdFiEE8GHWJGiqDefDJ1S170Ke+EeGjBQFAmPXDToACgkQ70Ke+EeG
-jBRcqQ/+PMaxRgeKnskW3rSUL8EfkXs42SOg4UuZeJrTd+CFyL6Bv2Slw6P+PPOl
-YhvJmr/jm+YUG9/vcCvYwrO+FGAzYM3qngNo9NSm2XfPR+XUBzM2GYnWvKY12yeL
-lL/V3PGnaJUyk16eZTtB1XXCgYsR+RIhrCh9r3UhCywT51Pam5Egy4IIs+dEukt7
-301vLuN4p3wfDFDnGq8dE5wVNCraWUCrVCXmvqblKLyTmOyONK/+dZjtR9/TdqtF
-yfj46r0mKXSmpRmLzzNy2tgDl5WJlZ38W3fQtHqMifdVAOHWUU8/R0EEQLvF1+zF
-o70SkZuQQJpRCB4bKR8ubQaHahT39LERNxP4411hKy75etzqliFMwntuQOqxWiuK
-OJjo0dGniWSP+lV0Zkp3U7PqEbR3Bm2umjz8O/8tNW1JXtZKn+ykG3y+AHnFJpRe
-7aiVDqSV9N9FvcivOl6aefPnQwTUBOuhHAqT4q5W6//b37LOQJdP2lx2TnVXnZ7/
-pxbgJ6xukgvnvFPtYvrzVmZIMUY1dtogogWaxhUk5RH0fuz1M/Y5+CtnnunA6OBR
-OSSg9OacEdOgcD0wiZLOyYcGqSkvWQoKoqlR5d/9YxJH6+VaSnrDCenVn1NeGpWn
-rIj1VpqPiVEh1/djkv68/wBDE2q/JuaGVhaUF9xB8X8DFt79HLU=
-=dDgN
------END PGP SIGNATURE-----
diff --git a/federated/peertube/address.md b/federated/peertube/address.md
deleted file mode 100644
index 2a32f8c..0000000
--- a/federated/peertube/address.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Peertube
-
-## Personal 
-
-[See here](https://kraut.zone/a/stephen/video-channels)
diff --git a/federated/peertube/address.md.asc b/federated/peertube/address.md.asc
deleted file mode 100644
index 569d5d6..0000000
--- a/federated/peertube/address.md.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-# Peertube
-
-## Personal 
-
-[See here](https://kraut.zone/a/stephen/video-channels)
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCgAdFiEE8GHWJGiqDefDJ1S170Ke+EeGjBQFAmPR/OQACgkQ70Ke+EeG
-jBTmCBAAirtxFmCPpKKj38bb/BgKqw5QnasKszdwsAUraqA9uCy23cIfmGxF6Idd
-0rKfrRlmXUYbU4Yn8GtGOu1Fz3zM8mBbC6hVB20gO34AxASiz9VAnmsAJrmO0XyO
-Lo/lNCz8uxdMWfxritaVxRajJCX1K+gYwWisGnwKv2CFgXVbLZ/z7Pl/Lgbim3ns
-lBYwdKsgtFBP+tY5i+0KcDovDRP4KbrC51Qnz27PVjbBQPu7X/CN86Kb8dAZaSaE
-/0va2r1A0onUmR9vg1I66QBh4EMD5Opj1qcoP4z5zLU5Lu5EhW7KM7ZAx8iSyNfv
-46Q9pTmXEzEk/uPwDh/5MYNW6af+I9hPBOa99FZHHR440n84+HITVNh4BQz1jU8u
-D5+5s4PAUwLL0EL37VNSawACeAJDkjLTT6HlsQMcGrhsNbOW5JLZup43Oict40Rp
-1TsejpSZJK2huZiVCWttsBsc5xBpZrQba2F12OAGDGVc1WRVtZzhhMAmilqLSYxi
-WJiE2qkh1NUCydGNX1/nDZ/zCzGba67VtVQDQO/QFXQe0o+/68j+HkLoU0Ej2iLT
-db118xI/h61ekEB3o5zWRNtLkTNZdilfg+/tox2qwtessknJB3f2mc7jWiD3iwLl
-wHVvRtSzrcRhGkXB4Uo8YftFoXrzjfVCgnUwHqzRE4tX8N3qMwE=
-=87Bv
------END PGP SIGNATURE-----
diff --git a/federated/nostr/address.md b/nostr/address.md
similarity index 100%
rename from federated/nostr/address.md
rename to nostr/address.md
diff --git a/federated/nostr/address.md.asc b/nostr/address.md.asc
similarity index 100%
rename from federated/nostr/address.md.asc
rename to nostr/address.md.asc