diff --git a/mbase/ctwm-git b/mbase/alsa-lib
similarity index 100%
rename from mbase/ctwm-git
rename to mbase/alsa-lib
diff --git a/mbase/gtk2-engines b/mbase/alsa-plugins
similarity index 100%
rename from mbase/gtk2-engines
rename to mbase/alsa-plugins
diff --git a/mbase/gtk2-theme-haiku b/mbase/alsa-utils
similarity index 100%
rename from mbase/gtk2-theme-haiku
rename to mbase/alsa-utils
diff --git a/mbase/lemonbar-xft-git b/mbase/classic-colors-git
similarity index 100%
rename from mbase/lemonbar-xft-git
rename to mbase/classic-colors-git
diff --git a/mbase/mtpaint-git b/mbase/dmenu
similarity index 100%
rename from mbase/mtpaint-git
rename to mbase/dmenu
diff --git a/mbase/shared-mime-info b/mbase/emwm
similarity index 100%
rename from mbase/shared-mime-info
rename to mbase/emwm
diff --git a/mbase/sup b/mbase/motif
similarity index 100%
rename from mbase/sup
rename to mbase/motif
diff --git a/mbase/syslinux b/mbase/musl-compat-git
similarity index 100%
rename from mbase/syslinux
rename to mbase/musl-compat-git
diff --git a/mbase/tt++ b/mbase/tt++
deleted file mode 100644
index e69de29..0000000
diff --git a/mbase/tzdata b/mbase/tzdata
deleted file mode 100644
index e69de29..0000000
diff --git a/mbase/tine-git b/mbase/x11-utils
similarity index 100%
rename from mbase/tine-git
rename to mbase/x11-utils
diff --git a/mbase/xcalc-git b/mbase/xcalc-git
deleted file mode 100644
index e69de29..0000000
diff --git a/mbase/xclip b/mbase/xclip
deleted file mode 100644
index e69de29..0000000
diff --git a/mbase/xclock b/mbase/xclock
deleted file mode 100644
index e69de29..0000000
diff --git a/mbase/xmessage-git b/mbase/xmessage-git
deleted file mode 100644
index e69de29..0000000
diff --git a/mbase/xprompt-git b/mbase/xprompt-git
deleted file mode 100644
index e69de29..0000000
diff --git a/core-mod/core/es/build b/ports/es/build
similarity index 100%
rename from core-mod/core/es/build
rename to ports/es/build
diff --git a/core-mod/core/es/checksums b/ports/es/checksums
similarity index 100%
rename from core-mod/core/es/checksums
rename to ports/es/checksums
diff --git a/core-mod/core/es/depends b/ports/es/depends
similarity index 100%
rename from core-mod/core/es/depends
rename to ports/es/depends
diff --git a/core-mod/core/es/manifest b/ports/es/manifest
similarity index 100%
rename from core-mod/core/es/manifest
rename to ports/es/manifest
diff --git a/core-mod/core/es/patches/musl.patch b/ports/es/patches/musl.patch
similarity index 100%
rename from core-mod/core/es/patches/musl.patch
rename to ports/es/patches/musl.patch
diff --git a/core-mod/core/es/sources b/ports/es/sources
similarity index 100%
rename from core-mod/core/es/sources
rename to ports/es/sources
diff --git a/core-mod/core/es/version b/ports/es/version
similarity index 100%
rename from core-mod/core/es/version
rename to ports/es/version