diff --git a/MAINT_TOOLS/stuff_core.rc b/MAINT_TOOLS/stuff_core.rc
index 2c683de..013c292 100644
--- a/MAINT_TOOLS/stuff_core.rc
+++ b/MAINT_TOOLS/stuff_core.rc
@@ -5,4 +5,6 @@ fn enum_core_deps { for (i in `{cat /var/db/kiss/repos/kiss-mfavila/core-mod/cor
 fn get_dep_paths { list=`{for (i in `{for (i in `enum_core_deps){kiss search $i|grep -v installed|grep -v 'core-mod/core'}}){printf '%s\n' $i}}
 printf %s\n $list|tr ' ' '\n'|sort|uniq}
 
-fn move_deps { for (i in `get_dep_paths){sup mv $i /var/db/kiss/repos/kiss-mfavila/core-mod/core/}}
+fn move_deps_test { for (i in `get_dep_paths){echo 'Moving' $i 'to /var/db/kiss/repos/kiss-mfavila/core/'^`{basename $i}}}
+
+fn move_deps_for_real_actually_be_careful_with_this { for (i in `get_dep_paths){echo 'Moving' $i 'to /var/db/kiss/repos/kiss-mfavila/core/'^`{basename $i};sup mv $i /var/db/kiss/repos/kiss-mfavila/core-mod/core/}}
diff --git a/community-mod/stable/autoconf/about b/core-mod/core/autoconf/about
similarity index 100%
rename from community-mod/stable/autoconf/about
rename to core-mod/core/autoconf/about
diff --git a/community-mod/stable/autoconf/build b/core-mod/core/autoconf/build
similarity index 100%
rename from community-mod/stable/autoconf/build
rename to core-mod/core/autoconf/build
diff --git a/community-mod/stable/autoconf/checksums b/core-mod/core/autoconf/checksums
similarity index 100%
rename from community-mod/stable/autoconf/checksums
rename to core-mod/core/autoconf/checksums
diff --git a/community-mod/stable/autoconf/depends b/core-mod/core/autoconf/depends
similarity index 100%
rename from community-mod/stable/autoconf/depends
rename to core-mod/core/autoconf/depends
diff --git a/community-mod/stable/autoconf/sources b/core-mod/core/autoconf/sources
similarity index 100%
rename from community-mod/stable/autoconf/sources
rename to core-mod/core/autoconf/sources
diff --git a/community-mod/stable/autoconf/version b/core-mod/core/autoconf/version
similarity index 100%
rename from community-mod/stable/autoconf/version
rename to core-mod/core/autoconf/version
diff --git a/community-mod/stable/automake/about b/core-mod/core/automake/about
similarity index 100%
rename from community-mod/stable/automake/about
rename to core-mod/core/automake/about
diff --git a/community-mod/stable/automake/build b/core-mod/core/automake/build
similarity index 100%
rename from community-mod/stable/automake/build
rename to core-mod/core/automake/build
diff --git a/community-mod/stable/automake/checksums b/core-mod/core/automake/checksums
similarity index 100%
rename from community-mod/stable/automake/checksums
rename to core-mod/core/automake/checksums
diff --git a/community-mod/stable/automake/depends b/core-mod/core/automake/depends
similarity index 100%
rename from community-mod/stable/automake/depends
rename to core-mod/core/automake/depends
diff --git a/community-mod/stable/automake/sources b/core-mod/core/automake/sources
similarity index 100%
rename from community-mod/stable/automake/sources
rename to core-mod/core/automake/sources
diff --git a/community-mod/stable/automake/version b/core-mod/core/automake/version
similarity index 100%
rename from community-mod/stable/automake/version
rename to core-mod/core/automake/version
diff --git a/community-mod/stable/bash/about b/core-mod/core/bash/about
similarity index 100%
rename from community-mod/stable/bash/about
rename to core-mod/core/bash/about
diff --git a/community-mod/stable/bash/build b/core-mod/core/bash/build
similarity index 100%
rename from community-mod/stable/bash/build
rename to core-mod/core/bash/build
diff --git a/community-mod/stable/bash/checksums b/core-mod/core/bash/checksums
similarity index 100%
rename from community-mod/stable/bash/checksums
rename to core-mod/core/bash/checksums
diff --git a/community-mod/stable/bash/depends b/core-mod/core/bash/depends
similarity index 100%
rename from community-mod/stable/bash/depends
rename to core-mod/core/bash/depends
diff --git a/community-mod/stable/bash/patches/bash-5.1-parallel_make.patch b/core-mod/core/bash/patches/bash-5.1-parallel_make.patch
similarity index 100%
rename from community-mod/stable/bash/patches/bash-5.1-parallel_make.patch
rename to core-mod/core/bash/patches/bash-5.1-parallel_make.patch
diff --git a/community-mod/stable/bash/sources b/core-mod/core/bash/sources
similarity index 100%
rename from community-mod/stable/bash/sources
rename to core-mod/core/bash/sources
diff --git a/community-mod/stable/bash/version b/core-mod/core/bash/version
similarity index 100%
rename from community-mod/stable/bash/version
rename to core-mod/core/bash/version
diff --git a/community-mod/stable/libtool/build b/core-mod/core/expat/build
similarity index 100%
rename from community-mod/stable/libtool/build
rename to core-mod/core/expat/build
diff --git a/core-mod/extra/expat/checksums b/core-mod/core/expat/checksums
similarity index 100%
rename from core-mod/extra/expat/checksums
rename to core-mod/core/expat/checksums
diff --git a/core-mod/extra/expat/sources b/core-mod/core/expat/sources
similarity index 100%
rename from core-mod/extra/expat/sources
rename to core-mod/core/expat/sources
diff --git a/core-mod/extra/expat/version b/core-mod/core/expat/version
similarity index 100%
rename from core-mod/extra/expat/version
rename to core-mod/core/expat/version
diff --git a/core-mod/extra/glib/build b/core-mod/core/glib/build
similarity index 100%
rename from core-mod/extra/glib/build
rename to core-mod/core/glib/build
diff --git a/core-mod/extra/glib/checksums b/core-mod/core/glib/checksums
similarity index 100%
rename from core-mod/extra/glib/checksums
rename to core-mod/core/glib/checksums
diff --git a/core-mod/extra/glib/depends b/core-mod/core/glib/depends
similarity index 100%
rename from core-mod/extra/glib/depends
rename to core-mod/core/glib/depends
diff --git a/core-mod/extra/glib/sources b/core-mod/core/glib/sources
similarity index 100%
rename from core-mod/extra/glib/sources
rename to core-mod/core/glib/sources
diff --git a/core-mod/extra/glib/version b/core-mod/core/glib/version
similarity index 100%
rename from core-mod/extra/glib/version
rename to core-mod/core/glib/version
diff --git a/core-mod/extra/libffi/build b/core-mod/core/libffi/build
similarity index 100%
rename from core-mod/extra/libffi/build
rename to core-mod/core/libffi/build
diff --git a/core-mod/extra/libffi/checksums b/core-mod/core/libffi/checksums
similarity index 100%
rename from core-mod/extra/libffi/checksums
rename to core-mod/core/libffi/checksums
diff --git a/core-mod/extra/libffi/depends b/core-mod/core/libffi/depends
similarity index 100%
rename from core-mod/extra/libffi/depends
rename to core-mod/core/libffi/depends
diff --git a/core-mod/extra/libffi/sources b/core-mod/core/libffi/sources
similarity index 100%
rename from core-mod/extra/libffi/sources
rename to core-mod/core/libffi/sources
diff --git a/core-mod/extra/libffi/version b/core-mod/core/libffi/version
similarity index 100%
rename from core-mod/extra/libffi/version
rename to core-mod/core/libffi/version
diff --git a/community-mod/stable/libgmp/build b/core-mod/core/libgmp/build
similarity index 100%
rename from community-mod/stable/libgmp/build
rename to core-mod/core/libgmp/build
diff --git a/community-mod/stable/libgmp/checksums b/core-mod/core/libgmp/checksums
similarity index 100%
rename from community-mod/stable/libgmp/checksums
rename to core-mod/core/libgmp/checksums
diff --git a/community-mod/stable/libgmp/depends b/core-mod/core/libgmp/depends
similarity index 100%
rename from community-mod/stable/libgmp/depends
rename to core-mod/core/libgmp/depends
diff --git a/community-mod/stable/libgmp/sources b/core-mod/core/libgmp/sources
similarity index 100%
rename from community-mod/stable/libgmp/sources
rename to core-mod/core/libgmp/sources
diff --git a/community-mod/stable/libgmp/version b/core-mod/core/libgmp/version
similarity index 100%
rename from community-mod/stable/libgmp/version
rename to core-mod/core/libgmp/version
diff --git a/core-mod/extra/expat/build b/core-mod/core/libtool/build
similarity index 100%
rename from core-mod/extra/expat/build
rename to core-mod/core/libtool/build
diff --git a/community-mod/stable/libtool/checksums b/core-mod/core/libtool/checksums
similarity index 100%
rename from community-mod/stable/libtool/checksums
rename to core-mod/core/libtool/checksums
diff --git a/community-mod/stable/libtool/depends b/core-mod/core/libtool/depends
similarity index 100%
rename from community-mod/stable/libtool/depends
rename to core-mod/core/libtool/depends
diff --git a/community-mod/stable/libtool/sources b/core-mod/core/libtool/sources
similarity index 100%
rename from community-mod/stable/libtool/sources
rename to core-mod/core/libtool/sources
diff --git a/community-mod/stable/libtool/version b/core-mod/core/libtool/version
similarity index 100%
rename from community-mod/stable/libtool/version
rename to core-mod/core/libtool/version
diff --git a/community-mod/stable/libusb/build b/core-mod/core/libusb/build
similarity index 100%
rename from community-mod/stable/libusb/build
rename to core-mod/core/libusb/build
diff --git a/community-mod/stable/libusb/checksums b/core-mod/core/libusb/checksums
similarity index 100%
rename from community-mod/stable/libusb/checksums
rename to core-mod/core/libusb/checksums
diff --git a/community-mod/stable/libusb/sources b/core-mod/core/libusb/sources
similarity index 100%
rename from community-mod/stable/libusb/sources
rename to core-mod/core/libusb/sources
diff --git a/community-mod/stable/libusb/version b/core-mod/core/libusb/version
similarity index 100%
rename from community-mod/stable/libusb/version
rename to core-mod/core/libusb/version
diff --git a/community-mod/stable/libxml2/build b/core-mod/core/libxml2/build
similarity index 100%
rename from community-mod/stable/libxml2/build
rename to core-mod/core/libxml2/build
diff --git a/community-mod/stable/libxml2/checksums b/core-mod/core/libxml2/checksums
similarity index 100%
rename from community-mod/stable/libxml2/checksums
rename to core-mod/core/libxml2/checksums
diff --git a/community-mod/stable/libxml2/depends b/core-mod/core/libxml2/depends
similarity index 100%
rename from community-mod/stable/libxml2/depends
rename to core-mod/core/libxml2/depends
diff --git a/community-mod/stable/libxml2/sources b/core-mod/core/libxml2/sources
similarity index 100%
rename from community-mod/stable/libxml2/sources
rename to core-mod/core/libxml2/sources
diff --git a/community-mod/stable/libxml2/version b/core-mod/core/libxml2/version
similarity index 100%
rename from community-mod/stable/libxml2/version
rename to core-mod/core/libxml2/version
diff --git a/core-mod/extra/meson/build b/core-mod/core/meson/build
similarity index 100%
rename from core-mod/extra/meson/build
rename to core-mod/core/meson/build
diff --git a/core-mod/extra/meson/checksums b/core-mod/core/meson/checksums
similarity index 100%
rename from core-mod/extra/meson/checksums
rename to core-mod/core/meson/checksums
diff --git a/core-mod/extra/meson/depends b/core-mod/core/meson/depends
similarity index 100%
rename from core-mod/extra/meson/depends
rename to core-mod/core/meson/depends
diff --git a/core-mod/extra/meson/sources b/core-mod/core/meson/sources
similarity index 100%
rename from core-mod/extra/meson/sources
rename to core-mod/core/meson/sources
diff --git a/core-mod/extra/meson/version b/core-mod/core/meson/version
similarity index 100%
rename from core-mod/extra/meson/version
rename to core-mod/core/meson/version
diff --git a/core-mod/extra/ncurses/build b/core-mod/core/ncurses/build
similarity index 100%
rename from core-mod/extra/ncurses/build
rename to core-mod/core/ncurses/build
diff --git a/core-mod/extra/ncurses/checksums b/core-mod/core/ncurses/checksums
similarity index 100%
rename from core-mod/extra/ncurses/checksums
rename to core-mod/core/ncurses/checksums
diff --git a/core-mod/extra/ncurses/sources b/core-mod/core/ncurses/sources
similarity index 100%
rename from core-mod/extra/ncurses/sources
rename to core-mod/core/ncurses/sources
diff --git a/core-mod/extra/ncurses/version b/core-mod/core/ncurses/version
similarity index 100%
rename from core-mod/extra/ncurses/version
rename to core-mod/core/ncurses/version
diff --git a/core-mod/extra/perl/build b/core-mod/core/perl/build
similarity index 100%
rename from core-mod/extra/perl/build
rename to core-mod/core/perl/build
diff --git a/core-mod/extra/perl/checksums b/core-mod/core/perl/checksums
similarity index 100%
rename from core-mod/extra/perl/checksums
rename to core-mod/core/perl/checksums
diff --git a/core-mod/extra/perl/depends b/core-mod/core/perl/depends
similarity index 100%
rename from core-mod/extra/perl/depends
rename to core-mod/core/perl/depends
diff --git a/core-mod/extra/perl/sources b/core-mod/core/perl/sources
similarity index 100%
rename from core-mod/extra/perl/sources
rename to core-mod/core/perl/sources
diff --git a/core-mod/extra/perl/version b/core-mod/core/perl/version
similarity index 100%
rename from core-mod/extra/perl/version
rename to core-mod/core/perl/version
diff --git a/core-mod/extra/pkgconf/build b/core-mod/core/pkgconf/build
similarity index 100%
rename from core-mod/extra/pkgconf/build
rename to core-mod/core/pkgconf/build
diff --git a/core-mod/extra/pkgconf/checksums b/core-mod/core/pkgconf/checksums
similarity index 100%
rename from core-mod/extra/pkgconf/checksums
rename to core-mod/core/pkgconf/checksums
diff --git a/core-mod/extra/pkgconf/sources b/core-mod/core/pkgconf/sources
similarity index 100%
rename from core-mod/extra/pkgconf/sources
rename to core-mod/core/pkgconf/sources
diff --git a/core-mod/extra/pkgconf/version b/core-mod/core/pkgconf/version
similarity index 100%
rename from core-mod/extra/pkgconf/version
rename to core-mod/core/pkgconf/version
diff --git a/core-mod/extra/python/build b/core-mod/core/python/build
similarity index 100%
rename from core-mod/extra/python/build
rename to core-mod/core/python/build
diff --git a/core-mod/extra/python/checksums b/core-mod/core/python/checksums
similarity index 100%
rename from core-mod/extra/python/checksums
rename to core-mod/core/python/checksums
diff --git a/core-mod/extra/python/depends b/core-mod/core/python/depends
similarity index 100%
rename from core-mod/extra/python/depends
rename to core-mod/core/python/depends
diff --git a/core-mod/extra/python/patches/python3-always-pip.patch b/core-mod/core/python/patches/python3-always-pip.patch
similarity index 100%
rename from core-mod/extra/python/patches/python3-always-pip.patch
rename to core-mod/core/python/patches/python3-always-pip.patch
diff --git a/core-mod/extra/python/sources b/core-mod/core/python/sources
similarity index 100%
rename from core-mod/extra/python/sources
rename to core-mod/core/python/sources
diff --git a/core-mod/extra/python/version b/core-mod/core/python/version
similarity index 100%
rename from core-mod/extra/python/version
rename to core-mod/core/python/version
diff --git a/core-mod/extra/samurai/build b/core-mod/core/samurai/build
similarity index 100%
rename from core-mod/extra/samurai/build
rename to core-mod/core/samurai/build
diff --git a/core-mod/extra/samurai/checksums b/core-mod/core/samurai/checksums
similarity index 100%
rename from core-mod/extra/samurai/checksums
rename to core-mod/core/samurai/checksums
diff --git a/core-mod/extra/samurai/sources b/core-mod/core/samurai/sources
similarity index 100%
rename from core-mod/extra/samurai/sources
rename to core-mod/core/samurai/sources
diff --git a/core-mod/extra/samurai/version b/core-mod/core/samurai/version
similarity index 100%
rename from core-mod/extra/samurai/version
rename to core-mod/core/samurai/version
diff --git a/core-mod/extra/sqlite/build b/core-mod/core/sqlite/build
similarity index 100%
rename from core-mod/extra/sqlite/build
rename to core-mod/core/sqlite/build
diff --git a/core-mod/extra/sqlite/checksums b/core-mod/core/sqlite/checksums
similarity index 100%
rename from core-mod/extra/sqlite/checksums
rename to core-mod/core/sqlite/checksums
diff --git a/core-mod/extra/sqlite/depends b/core-mod/core/sqlite/depends
similarity index 100%
rename from core-mod/extra/sqlite/depends
rename to core-mod/core/sqlite/depends
diff --git a/core-mod/extra/sqlite/sources b/core-mod/core/sqlite/sources
similarity index 100%
rename from core-mod/extra/sqlite/sources
rename to core-mod/core/sqlite/sources
diff --git a/core-mod/extra/sqlite/version b/core-mod/core/sqlite/version
similarity index 100%
rename from core-mod/extra/sqlite/version
rename to core-mod/core/sqlite/version
diff --git a/core-mod/extra/util-linux/build b/core-mod/core/util-linux/build
similarity index 100%
rename from core-mod/extra/util-linux/build
rename to core-mod/core/util-linux/build
diff --git a/core-mod/extra/util-linux/checksums b/core-mod/core/util-linux/checksums
similarity index 100%
rename from core-mod/extra/util-linux/checksums
rename to core-mod/core/util-linux/checksums
diff --git a/core-mod/extra/util-linux/depends b/core-mod/core/util-linux/depends
similarity index 100%
rename from core-mod/extra/util-linux/depends
rename to core-mod/core/util-linux/depends
diff --git a/core-mod/extra/util-linux/sources b/core-mod/core/util-linux/sources
similarity index 100%
rename from core-mod/extra/util-linux/sources
rename to core-mod/core/util-linux/sources
diff --git a/core-mod/extra/util-linux/version b/core-mod/core/util-linux/version
similarity index 100%
rename from core-mod/extra/util-linux/version
rename to core-mod/core/util-linux/version
diff --git a/testing/libffi/build b/testing/libffi/build
deleted file mode 100755
index 7f3e4bf..0000000
--- a/testing/libffi/build
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --with-pic
-
-make
-make DESTDIR="$1" install
-
-# Maintain compatibility and avoid the need
-# for rebuilds of all packages linking to
-# libffi.
-ln -s libffi.so.8 "$1/usr/lib/libffi.so.7"
-#
-# ABI incompatibility only affects AArch64.
-# See: https://github.com/libffi/libffi/commit/c02c341
-#      https://github.com/libffi/libffi/issues/528
-ln -s libffi.so.7 "$1/usr/lib/libffi.so.6"
diff --git a/testing/libffi/checksums b/testing/libffi/checksums
deleted file mode 100644
index 14695d6..0000000
--- a/testing/libffi/checksums
+++ /dev/null
@@ -1 +0,0 @@
-540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620
diff --git a/testing/libffi/depends b/testing/libffi/depends
deleted file mode 100644
index 1f97bc3..0000000
--- a/testing/libffi/depends
+++ /dev/null
@@ -1 +0,0 @@
-linux-headers make
diff --git a/testing/libffi/sources b/testing/libffi/sources
deleted file mode 100644
index a966e96..0000000
--- a/testing/libffi/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz
diff --git a/testing/libffi/version b/testing/libffi/version
deleted file mode 100644
index ddd85e5..0000000
--- a/testing/libffi/version
+++ /dev/null
@@ -1 +0,0 @@
-3.4.2 2