diff --git a/satellites/3dstool-git.sat b/graveyard/unmaintained_satellites/3dstool-git.sat
similarity index 100%
rename from satellites/3dstool-git.sat
rename to graveyard/unmaintained_satellites/3dstool-git.sat
diff --git a/satellites/apulse.sat b/graveyard/unmaintained_satellites/apulse.sat
similarity index 100%
rename from satellites/apulse.sat
rename to graveyard/unmaintained_satellites/apulse.sat
diff --git a/satellites/armips-git.sat b/graveyard/unmaintained_satellites/armips-git.sat
similarity index 100%
rename from satellites/armips-git.sat
rename to graveyard/unmaintained_satellites/armips-git.sat
diff --git a/satellites/bam-0.4.sat b/graveyard/unmaintained_satellites/bam-0.4.sat
similarity index 100%
rename from satellites/bam-0.4.sat
rename to graveyard/unmaintained_satellites/bam-0.4.sat
diff --git a/satellites/bam.sat b/graveyard/unmaintained_satellites/bam.sat
similarity index 100%
rename from satellites/bam.sat
rename to graveyard/unmaintained_satellites/bam.sat
diff --git a/satellites/bctoolbox.sat b/graveyard/unmaintained_satellites/bctoolbox.sat
similarity index 100%
rename from satellites/bctoolbox.sat
rename to graveyard/unmaintained_satellites/bctoolbox.sat
diff --git a/satellites/bluez-alsa-git.sat b/graveyard/unmaintained_satellites/bluez-alsa-git.sat
similarity index 100%
rename from satellites/bluez-alsa-git.sat
rename to graveyard/unmaintained_satellites/bluez-alsa-git.sat
diff --git a/satellites/broadcom-wl.sat b/graveyard/unmaintained_satellites/broadcom-wl.sat
similarity index 100%
rename from satellites/broadcom-wl.sat
rename to graveyard/unmaintained_satellites/broadcom-wl.sat
diff --git a/satellites/cabextract.sat b/graveyard/unmaintained_satellites/cabextract.sat
similarity index 100%
rename from satellites/cabextract.sat
rename to graveyard/unmaintained_satellites/cabextract.sat
diff --git a/satellites/ctrtool-git.sat b/graveyard/unmaintained_satellites/ctrtool-git.sat
similarity index 100%
rename from satellites/ctrtool-git.sat
rename to graveyard/unmaintained_satellites/ctrtool-git.sat
diff --git a/satellites/ctrtool.sat b/graveyard/unmaintained_satellites/ctrtool.sat
similarity index 100%
rename from satellites/ctrtool.sat
rename to graveyard/unmaintained_satellites/ctrtool.sat
diff --git a/satellites/ctrulib-bin.sat b/graveyard/unmaintained_satellites/ctrulib-bin.sat
similarity index 100%
rename from satellites/ctrulib-bin.sat
rename to graveyard/unmaintained_satellites/ctrulib-bin.sat
diff --git a/satellites/ctrulib-git.sat b/graveyard/unmaintained_satellites/ctrulib-git.sat
similarity index 100%
rename from satellites/ctrulib-git.sat
rename to graveyard/unmaintained_satellites/ctrulib-git.sat
diff --git a/satellites/devkitarm-bin.sat b/graveyard/unmaintained_satellites/devkitarm-bin.sat
similarity index 100%
rename from satellites/devkitarm-bin.sat
rename to graveyard/unmaintained_satellites/devkitarm-bin.sat
diff --git a/satellites/dunst.sat b/graveyard/unmaintained_satellites/dunst.sat
similarity index 100%
rename from satellites/dunst.sat
rename to graveyard/unmaintained_satellites/dunst.sat
diff --git a/satellites/fdk-aac.sat b/graveyard/unmaintained_satellites/fdk-aac.sat
similarity index 100%
rename from satellites/fdk-aac.sat
rename to graveyard/unmaintained_satellites/fdk-aac.sat
diff --git a/satellites/feh.sat b/graveyard/unmaintained_satellites/feh.sat
similarity index 100%
rename from satellites/feh.sat
rename to graveyard/unmaintained_satellites/feh.sat
diff --git a/satellites/fluidsynth.sat b/graveyard/unmaintained_satellites/fluidsynth.sat
similarity index 100%
rename from satellites/fluidsynth.sat
rename to graveyard/unmaintained_satellites/fluidsynth.sat
diff --git a/satellites/gfm-git.sat b/graveyard/unmaintained_satellites/gfm-git.sat
similarity index 100%
rename from satellites/gfm-git.sat
rename to graveyard/unmaintained_satellites/gfm-git.sat
diff --git a/satellites/go.sat b/graveyard/unmaintained_satellites/go.sat
similarity index 100%
rename from satellites/go.sat
rename to graveyard/unmaintained_satellites/go.sat
diff --git a/satellites/gtksourceview2.sat b/graveyard/unmaintained_satellites/gtksourceview2.sat
similarity index 100%
rename from satellites/gtksourceview2.sat
rename to graveyard/unmaintained_satellites/gtksourceview2.sat
diff --git a/satellites/i3lock.sat b/graveyard/unmaintained_satellites/i3lock.sat
similarity index 100%
rename from satellites/i3lock.sat
rename to graveyard/unmaintained_satellites/i3lock.sat
diff --git a/satellites/iasl.sat b/graveyard/unmaintained_satellites/iasl.sat
similarity index 100%
rename from satellites/iasl.sat
rename to graveyard/unmaintained_satellites/iasl.sat
diff --git a/satellites/intel-ucode.sat b/graveyard/unmaintained_satellites/intel-ucode.sat
similarity index 100%
rename from satellites/intel-ucode.sat
rename to graveyard/unmaintained_satellites/intel-ucode.sat
diff --git a/satellites/json-glib.sat b/graveyard/unmaintained_satellites/json-glib.sat
similarity index 100%
rename from satellites/json-glib.sat
rename to graveyard/unmaintained_satellites/json-glib.sat
diff --git a/satellites/jsoncpp.sat b/graveyard/unmaintained_satellites/jsoncpp.sat
similarity index 100%
rename from satellites/jsoncpp.sat
rename to graveyard/unmaintained_satellites/jsoncpp.sat
diff --git a/satellites/jstest-gtk-git.sat b/graveyard/unmaintained_satellites/jstest-gtk-git.sat
similarity index 100%
rename from satellites/jstest-gtk-git.sat
rename to graveyard/unmaintained_satellites/jstest-gtk-git.sat
diff --git a/satellites/kpartx.sat b/graveyard/unmaintained_satellites/kpartx.sat
similarity index 100%
rename from satellites/kpartx.sat
rename to graveyard/unmaintained_satellites/kpartx.sat
diff --git a/satellites/libbsd.sat b/graveyard/unmaintained_satellites/libbsd.sat
similarity index 100%
rename from satellites/libbsd.sat
rename to graveyard/unmaintained_satellites/libbsd.sat
diff --git a/satellites/libgdiplus.sat b/graveyard/unmaintained_satellites/libgdiplus.sat
similarity index 100%
rename from satellites/libgdiplus.sat
rename to graveyard/unmaintained_satellites/libgdiplus.sat
diff --git a/satellites/libmodplug.sat b/graveyard/unmaintained_satellites/libmodplug.sat
similarity index 100%
rename from satellites/libmodplug.sat
rename to graveyard/unmaintained_satellites/libmodplug.sat
diff --git a/satellites/libticables-git.sat b/graveyard/unmaintained_satellites/libticables-git.sat
similarity index 100%
rename from satellites/libticables-git.sat
rename to graveyard/unmaintained_satellites/libticables-git.sat
diff --git a/satellites/libticalcs-git.sat b/graveyard/unmaintained_satellites/libticalcs-git.sat
similarity index 100%
rename from satellites/libticalcs-git.sat
rename to graveyard/unmaintained_satellites/libticalcs-git.sat
diff --git a/satellites/libticonv-git.sat b/graveyard/unmaintained_satellites/libticonv-git.sat
similarity index 100%
rename from satellites/libticonv-git.sat
rename to graveyard/unmaintained_satellites/libticonv-git.sat
diff --git a/satellites/libtifiles-git.sat b/graveyard/unmaintained_satellites/libtifiles-git.sat
similarity index 100%
rename from satellites/libtifiles-git.sat
rename to graveyard/unmaintained_satellites/libtifiles-git.sat
diff --git a/satellites/libxdg-basedir.sat b/graveyard/unmaintained_satellites/libxdg-basedir.sat
similarity index 100%
rename from satellites/libxdg-basedir.sat
rename to graveyard/unmaintained_satellites/libxdg-basedir.sat
diff --git a/satellites/livestreamer.sat b/graveyard/unmaintained_satellites/livestreamer.sat
similarity index 100%
rename from satellites/livestreamer.sat
rename to graveyard/unmaintained_satellites/livestreamer.sat
diff --git a/satellites/love.sat b/graveyard/unmaintained_satellites/love.sat
similarity index 100%
rename from satellites/love.sat
rename to graveyard/unmaintained_satellites/love.sat
diff --git a/satellites/makerom-git.sat b/graveyard/unmaintained_satellites/makerom-git.sat
similarity index 100%
rename from satellites/makerom-git.sat
rename to graveyard/unmaintained_satellites/makerom-git.sat
diff --git a/satellites/makerom.sat b/graveyard/unmaintained_satellites/makerom.sat
similarity index 100%
rename from satellites/makerom.sat
rename to graveyard/unmaintained_satellites/makerom.sat
diff --git a/satellites/mbedtls.sat b/graveyard/unmaintained_satellites/mbedtls.sat
similarity index 100%
rename from satellites/mbedtls.sat
rename to graveyard/unmaintained_satellites/mbedtls.sat
diff --git a/satellites/mono.sat b/graveyard/unmaintained_satellites/mono.sat
similarity index 100%
rename from satellites/mono.sat
rename to graveyard/unmaintained_satellites/mono.sat
diff --git a/satellites/nxengine.sat b/graveyard/unmaintained_satellites/nxengine.sat
similarity index 100%
rename from satellites/nxengine.sat
rename to graveyard/unmaintained_satellites/nxengine.sat
diff --git a/satellites/openal.sat b/graveyard/unmaintained_satellites/openal.sat
similarity index 100%
rename from satellites/openal.sat
rename to graveyard/unmaintained_satellites/openal.sat
diff --git a/satellites/openrc.sat b/graveyard/unmaintained_satellites/openrc.sat
similarity index 100%
rename from satellites/openrc.sat
rename to graveyard/unmaintained_satellites/openrc.sat
diff --git a/satellites/ortp.sat b/graveyard/unmaintained_satellites/ortp.sat
similarity index 100%
rename from satellites/ortp.sat
rename to graveyard/unmaintained_satellites/ortp.sat
diff --git a/satellites/p7zip.sat b/graveyard/unmaintained_satellites/p7zip.sat
similarity index 100%
rename from satellites/p7zip.sat
rename to graveyard/unmaintained_satellites/p7zip.sat
diff --git a/satellites/padxorer.sat b/graveyard/unmaintained_satellites/padxorer.sat
similarity index 100%
rename from satellites/padxorer.sat
rename to graveyard/unmaintained_satellites/padxorer.sat
diff --git a/satellites/pdnsd.sat b/graveyard/unmaintained_satellites/pdnsd.sat
similarity index 100%
rename from satellites/pdnsd.sat
rename to graveyard/unmaintained_satellites/pdnsd.sat
diff --git a/satellites/physfs.sat b/graveyard/unmaintained_satellites/physfs.sat
similarity index 100%
rename from satellites/physfs.sat
rename to graveyard/unmaintained_satellites/physfs.sat
diff --git a/satellites/pidgin-libnotify.sat b/graveyard/unmaintained_satellites/pidgin-libnotify.sat
similarity index 100%
rename from satellites/pidgin-libnotify.sat
rename to graveyard/unmaintained_satellites/pidgin-libnotify.sat
diff --git a/satellites/purple-skypeweb.sat b/graveyard/unmaintained_satellites/purple-skypeweb.sat
similarity index 100%
rename from satellites/purple-skypeweb.sat
rename to graveyard/unmaintained_satellites/purple-skypeweb.sat
diff --git a/satellites/purple-telegram.sat b/graveyard/unmaintained_satellites/purple-telegram.sat
similarity index 100%
rename from satellites/purple-telegram.sat
rename to graveyard/unmaintained_satellites/purple-telegram.sat
diff --git a/satellites/pygtksourceview2.sat b/graveyard/unmaintained_satellites/pygtksourceview2.sat
similarity index 100%
rename from satellites/pygtksourceview2.sat
rename to graveyard/unmaintained_satellites/pygtksourceview2.sat
diff --git a/satellites/python3-docutils.sat b/graveyard/unmaintained_satellites/python3-docutils.sat
similarity index 100%
rename from satellites/python3-docutils.sat
rename to graveyard/unmaintained_satellites/python3-docutils.sat
diff --git a/satellites/python3-qt5.sat b/graveyard/unmaintained_satellites/python3-qt5.sat
similarity index 100%
rename from satellites/python3-qt5.sat
rename to graveyard/unmaintained_satellites/python3-qt5.sat
diff --git a/satellites/python3-requests.sat b/graveyard/unmaintained_satellites/python3-requests.sat
similarity index 100%
rename from satellites/python3-requests.sat
rename to graveyard/unmaintained_satellites/python3-requests.sat
diff --git a/satellites/python3-setuptools.sat b/graveyard/unmaintained_satellites/python3-setuptools.sat
similarity index 100%
rename from satellites/python3-setuptools.sat
rename to graveyard/unmaintained_satellites/python3-setuptools.sat
diff --git a/satellites/python3-yaml.sat b/graveyard/unmaintained_satellites/python3-yaml.sat
similarity index 100%
rename from satellites/python3-yaml.sat
rename to graveyard/unmaintained_satellites/python3-yaml.sat
diff --git a/satellites/qemu.sat b/graveyard/unmaintained_satellites/qemu.sat
similarity index 100%
rename from satellites/qemu.sat
rename to graveyard/unmaintained_satellites/qemu.sat
diff --git a/satellites/qt5-webkit.sat b/graveyard/unmaintained_satellites/qt5-webkit.sat
similarity index 100%
rename from satellites/qt5-webkit.sat
rename to graveyard/unmaintained_satellites/qt5-webkit.sat
diff --git a/satellites/qt5-x11extras.sat b/graveyard/unmaintained_satellites/qt5-x11extras.sat
similarity index 100%
rename from satellites/qt5-x11extras.sat
rename to graveyard/unmaintained_satellites/qt5-x11extras.sat
diff --git a/satellites/radare2-git.sat b/graveyard/unmaintained_satellites/radare2-git.sat
similarity index 100%
rename from satellites/radare2-git.sat
rename to graveyard/unmaintained_satellites/radare2-git.sat
diff --git a/satellites/sdl2.sat b/graveyard/unmaintained_satellites/sdl2.sat
similarity index 100%
rename from satellites/sdl2.sat
rename to graveyard/unmaintained_satellites/sdl2.sat
diff --git a/satellites/sdl2_image.sat b/graveyard/unmaintained_satellites/sdl2_image.sat
similarity index 100%
rename from satellites/sdl2_image.sat
rename to graveyard/unmaintained_satellites/sdl2_image.sat
diff --git a/satellites/sdl2_mixer.sat b/graveyard/unmaintained_satellites/sdl2_mixer.sat
similarity index 100%
rename from satellites/sdl2_mixer.sat
rename to graveyard/unmaintained_satellites/sdl2_mixer.sat
diff --git a/satellites/snappy.sat b/graveyard/unmaintained_satellites/snappy.sat
similarity index 100%
rename from satellites/snappy.sat
rename to graveyard/unmaintained_satellites/snappy.sat
diff --git a/satellites/spasm-ng-git.sat b/graveyard/unmaintained_satellites/spasm-ng-git.sat
similarity index 100%
rename from satellites/spasm-ng-git.sat
rename to graveyard/unmaintained_satellites/spasm-ng-git.sat
diff --git a/satellites/steam.sat b/graveyard/unmaintained_satellites/steam.sat
similarity index 100%
rename from satellites/steam.sat
rename to graveyard/unmaintained_satellites/steam.sat
diff --git a/satellites/stepmania.sat b/graveyard/unmaintained_satellites/stepmania.sat
similarity index 100%
rename from satellites/stepmania.sat
rename to graveyard/unmaintained_satellites/stepmania.sat
diff --git a/satellites/streamlink.sat b/graveyard/unmaintained_satellites/streamlink.sat
similarity index 100%
rename from satellites/streamlink.sat
rename to graveyard/unmaintained_satellites/streamlink.sat
diff --git a/satellites/syncthing.sat b/graveyard/unmaintained_satellites/syncthing.sat
similarity index 100%
rename from satellites/syncthing.sat
rename to graveyard/unmaintained_satellites/syncthing.sat
diff --git a/satellites/teeworlds.sat b/graveyard/unmaintained_satellites/teeworlds.sat
similarity index 100%
rename from satellites/teeworlds.sat
rename to graveyard/unmaintained_satellites/teeworlds.sat
diff --git a/satellites/texmaker.sat b/graveyard/unmaintained_satellites/texmaker.sat
similarity index 100%
rename from satellites/texmaker.sat
rename to graveyard/unmaintained_satellites/texmaker.sat
diff --git a/satellites/tilp-git.sat b/graveyard/unmaintained_satellites/tilp-git.sat
similarity index 100%
rename from satellites/tilp-git.sat
rename to graveyard/unmaintained_satellites/tilp-git.sat
diff --git a/satellites/tlp.sat b/graveyard/unmaintained_satellites/tlp.sat
similarity index 100%
rename from satellites/tlp.sat
rename to graveyard/unmaintained_satellites/tlp.sat
diff --git a/satellites/unetbootin.sat b/graveyard/unmaintained_satellites/unetbootin.sat
similarity index 100%
rename from satellites/unetbootin.sat
rename to graveyard/unmaintained_satellites/unetbootin.sat
diff --git a/satellites/vbindiff.sat b/graveyard/unmaintained_satellites/vbindiff.sat
similarity index 100%
rename from satellites/vbindiff.sat
rename to graveyard/unmaintained_satellites/vbindiff.sat
diff --git a/satellites/virtualbox.sat b/graveyard/unmaintained_satellites/virtualbox.sat
similarity index 100%
rename from satellites/virtualbox.sat
rename to graveyard/unmaintained_satellites/virtualbox.sat
diff --git a/satellites/wine.sat b/graveyard/unmaintained_satellites/wine.sat
similarity index 100%
rename from satellites/wine.sat
rename to graveyard/unmaintained_satellites/wine.sat
diff --git a/satellites/xautolock.sat b/graveyard/unmaintained_satellites/xautolock.sat
similarity index 100%
rename from satellites/xautolock.sat
rename to graveyard/unmaintained_satellites/xautolock.sat
diff --git a/satellites/youtube-dl.sat b/graveyard/unmaintained_satellites/youtube-dl.sat
similarity index 100%
rename from satellites/youtube-dl.sat
rename to graveyard/unmaintained_satellites/youtube-dl.sat
diff --git a/satellites/astronaut.sat b/satellites/astronaut.sat
deleted file mode 120000
index df636ec..0000000
--- a/satellites/astronaut.sat
+++ /dev/null
@@ -1 +0,0 @@
-../astronaut/astronaut.sat
\ No newline at end of file