diff --git a/from-callmetango/README.md b/from-callmetango/README.md
deleted file mode 100644
index b140289..0000000
--- a/from-callmetango/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# rpmspecs-wip
-The work in progress version of the SonicDE rpmspecs
diff --git a/from-callmetango/kde-to-sonic.csv b/kde-to-sonic.csv
similarity index 100%
rename from from-callmetango/kde-to-sonic.csv
rename to kde-to-sonic.csv
diff --git a/from-callmetango/kf6-kglobalaccel/.directory b/sonic-desktop-interface/.directory
similarity index 100%
rename from from-callmetango/kf6-kglobalaccel/.directory
rename to sonic-desktop-interface/.directory
diff --git a/from-callmetango/plasma-desktop/breeze-fedora-0.3.tar.gz b/sonic-desktop-interface/breeze-fedora-0.3.tar.gz
similarity index 100%
rename from from-callmetango/plasma-desktop/breeze-fedora-0.3.tar.gz
rename to sonic-desktop-interface/breeze-fedora-0.3.tar.gz
diff --git a/from-callmetango/plasma-desktop/hide-virtual-keyboard-indicator-on-sddm.patch b/sonic-desktop-interface/hide-virtual-keyboard-indicator-on-sddm.patch
similarity index 100%
rename from from-callmetango/plasma-desktop/hide-virtual-keyboard-indicator-on-sddm.patch
rename to sonic-desktop-interface/hide-virtual-keyboard-indicator-on-sddm.patch
diff --git a/from-callmetango/plasma-desktop/plasma-desktop.spec b/sonic-desktop-interface/sonic-desktop-interface.spec
similarity index 100%
rename from from-callmetango/plasma-desktop/plasma-desktop.spec
rename to sonic-desktop-interface/sonic-desktop-interface.spec
diff --git a/from-callmetango/plasma-desktop/tree.txt b/sonic-desktop-interface/tree.txt
similarity index 100%
rename from from-callmetango/plasma-desktop/tree.txt
rename to sonic-desktop-interface/tree.txt
diff --git a/from-callmetango/kf6-kwindowsystem/.directory b/sonic-frameworks-keybind/.directory
similarity index 100%
rename from from-callmetango/kf6-kwindowsystem/.directory
rename to sonic-frameworks-keybind/.directory
diff --git a/from-callmetango/kf6-kglobalaccel/kf6-kglobalaccel.spec b/sonic-frameworks-keybind/sonic-frameworks-keybind.spec
similarity index 100%
rename from from-callmetango/kf6-kglobalaccel/kf6-kglobalaccel.spec
rename to sonic-frameworks-keybind/sonic-frameworks-keybind.spec
diff --git a/from-callmetango/kglobalacceld/.directory b/sonic-frameworks-windowsystem/.directory
similarity index 100%
rename from from-callmetango/kglobalacceld/.directory
rename to sonic-frameworks-windowsystem/.directory
diff --git a/from-callmetango/kf6-kwindowsystem/kf6-kwindowsystem.spec b/sonic-frameworks-windowsystem/sonic-frameworks-windowsystem.spec
similarity index 100%
rename from from-callmetango/kf6-kwindowsystem/kf6-kwindowsystem.spec
rename to sonic-frameworks-windowsystem/sonic-frameworks-windowsystem.spec
diff --git a/from-callmetango/kinfocenter/.directory b/sonic-interface-libraries/.directory
similarity index 100%
rename from from-callmetango/kinfocenter/.directory
rename to sonic-interface-libraries/.directory
diff --git a/from-callmetango/libplasma/libplasma.spec b/sonic-interface-libraries/sonic-interface-libraries.spec
similarity index 100%
rename from from-callmetango/libplasma/libplasma.spec
rename to sonic-interface-libraries/sonic-interface-libraries.spec
diff --git a/from-callmetango/kscreen/.directory b/sonic-keybind-daemon/.directory
similarity index 100%
rename from from-callmetango/kscreen/.directory
rename to sonic-keybind-daemon/.directory
diff --git a/from-callmetango/kglobalacceld/kglobalacceld.spec b/sonic-keybind-daemon/sonic-keybind-daemon.spec
similarity index 100%
rename from from-callmetango/kglobalacceld/kglobalacceld.spec
rename to sonic-keybind-daemon/sonic-keybind-daemon.spec
diff --git a/from-callmetango/plasma-login-manager/README.scripts b/sonic-login-manager/README.scripts
similarity index 100%
rename from from-callmetango/plasma-login-manager/README.scripts
rename to sonic-login-manager/README.scripts
diff --git a/from-callmetango/plasma-login-manager/plasmalogin-environment_file.patch b/sonic-login-manager/plasmalogin-environment_file.patch
similarity index 100%
rename from from-callmetango/plasma-login-manager/plasmalogin-environment_file.patch
rename to sonic-login-manager/plasmalogin-environment_file.patch
diff --git a/from-callmetango/plasma-login-manager/plasmalogin-rpmostree-tmpfiles-hack.patch b/sonic-login-manager/plasmalogin-rpmostree-tmpfiles-hack.patch
similarity index 100%
rename from from-callmetango/plasma-login-manager/plasmalogin-rpmostree-tmpfiles-hack.patch
rename to sonic-login-manager/plasmalogin-rpmostree-tmpfiles-hack.patch
diff --git a/from-callmetango/plasma-login-manager/plasmalogin.conf b/sonic-login-manager/plasmalogin.conf
similarity index 100%
rename from from-callmetango/plasma-login-manager/plasmalogin.conf
rename to sonic-login-manager/plasmalogin.conf
diff --git a/from-callmetango/plasma-login-manager/plasmalogin.sysconfig b/sonic-login-manager/plasmalogin.sysconfig
similarity index 100%
rename from from-callmetango/plasma-login-manager/plasmalogin.sysconfig
rename to sonic-login-manager/plasmalogin.sysconfig
diff --git a/from-callmetango/plasma-login-manager/plasmalogin.sysusers b/sonic-login-manager/plasmalogin.sysusers
similarity index 100%
rename from from-callmetango/plasma-login-manager/plasmalogin.sysusers
rename to sonic-login-manager/plasmalogin.sysusers
diff --git a/from-callmetango/plasma-login-manager/plasma-login-manager.spec b/sonic-login-manager/sonic-login-manager.spec
similarity index 100%
rename from from-callmetango/plasma-login-manager/plasma-login-manager.spec
rename to sonic-login-manager/sonic-login-manager.spec
diff --git a/from-callmetango/kscreenlocker/.directory b/sonic-screen-library/.directory
similarity index 100%
rename from from-callmetango/kscreenlocker/.directory
rename to sonic-screen-library/.directory
diff --git a/from-callmetango/libkscreen/libkscreen.spec b/sonic-screen-library/sonic-screen-library.spec
similarity index 100%
rename from from-callmetango/libkscreen/libkscreen.spec
rename to sonic-screen-library/sonic-screen-library.spec
diff --git a/from-callmetango/kwin/.directory b/sonic-screen/.directory
similarity index 100%
rename from from-callmetango/kwin/.directory
rename to sonic-screen/.directory
diff --git a/from-callmetango/kscreen/kscreen.spec b/sonic-screen/sonic-screen.spec
similarity index 100%
rename from from-callmetango/kscreen/kscreen.spec
rename to sonic-screen/sonic-screen.spec
diff --git a/from-callmetango/libkscreen/.directory b/sonic-screenlocker/.directory
similarity index 100%
rename from from-callmetango/libkscreen/.directory
rename to sonic-screenlocker/.directory
diff --git a/from-callmetango/kscreenlocker/sonic-screenlocker-6.6.5.2-fake-version-6.6.4.patch b/sonic-screenlocker/sonic-screenlocker-6.6.5.2-fake-version-6.6.4.patch
similarity index 100%
rename from from-callmetango/kscreenlocker/sonic-screenlocker-6.6.5.2-fake-version-6.6.4.patch
rename to sonic-screenlocker/sonic-screenlocker-6.6.5.2-fake-version-6.6.4.patch
diff --git a/from-callmetango/kscreenlocker/kscreenlocker.spec b/sonic-screenlocker/sonic-screenlocker.spec
similarity index 100%
rename from from-callmetango/kscreenlocker/kscreenlocker.spec
rename to sonic-screenlocker/sonic-screenlocker.spec
diff --git a/from-callmetango/sonic-silver-theme/sonic-silver-theme.spec b/sonic-silver-theme/sonic-silver-theme.spec
similarity index 100%
rename from from-callmetango/sonic-silver-theme/sonic-silver-theme.spec
rename to sonic-silver-theme/sonic-silver-theme.spec
diff --git a/from-callmetango/libksysguard/.directory b/sonic-sysguard-library/.directory
similarity index 100%
rename from from-callmetango/libksysguard/.directory
rename to sonic-sysguard-library/.directory
diff --git a/from-callmetango/libksysguard/libksysguard.spec b/sonic-sysguard-library/sonic-sysguard-library.spec
similarity index 100%
rename from from-callmetango/libksysguard/libksysguard.spec
rename to sonic-sysguard-library/sonic-sysguard-library.spec
diff --git a/from-callmetango/libplasma/.directory b/sonic-system-info/.directory
similarity index 100%
rename from from-callmetango/libplasma/.directory
rename to sonic-system-info/.directory
diff --git a/from-callmetango/kinfocenter/kinfocenter.spec b/sonic-system-info/sonic-system-info.spec
similarity index 100%
rename from from-callmetango/kinfocenter/kinfocenter.spec
rename to sonic-system-info/sonic-system-info.spec
diff --git a/from-callmetango/plasma-desktop/.directory b/sonic-win/.directory
similarity index 100%
rename from from-callmetango/plasma-desktop/.directory
rename to sonic-win/.directory
diff --git a/from-callmetango/kwin/kwin.spec b/sonic-win/sonic-win.spec
similarity index 100%
rename from from-callmetango/kwin/kwin.spec
rename to sonic-win/sonic-win.spec
diff --git a/from-callmetango/kwin/tree.txt b/sonic-win/tree.txt
similarity index 100%
rename from from-callmetango/kwin/tree.txt
rename to sonic-win/tree.txt
diff --git a/from-callmetango/plasma-workspace/.directory b/sonic-workspace/.directory
similarity index 100%
rename from from-callmetango/plasma-workspace/.directory
rename to sonic-workspace/.directory
diff --git a/from-callmetango/plasma-workspace/fedora-lookandfeel.json b/sonic-workspace/fedora-lookandfeel.json
similarity index 100%
rename from from-callmetango/plasma-workspace/fedora-lookandfeel.json
rename to sonic-workspace/fedora-lookandfeel.json
diff --git a/from-callmetango/plasma-workspace/fedoradark-lookandfeel.json b/sonic-workspace/fedoradark-lookandfeel.json
similarity index 100%
rename from from-callmetango/plasma-workspace/fedoradark-lookandfeel.json
rename to sonic-workspace/fedoradark-lookandfeel.json
diff --git a/from-callmetango/plasma-workspace/fedoralight-lookandfeel.json b/sonic-workspace/fedoralight-lookandfeel.json
similarity index 100%
rename from from-callmetango/plasma-workspace/fedoralight-lookandfeel.json
rename to sonic-workspace/fedoralight-lookandfeel.json
diff --git a/from-callmetango/plasma-workspace/kde b/sonic-workspace/kde
similarity index 100%
rename from from-callmetango/plasma-workspace/kde
rename to sonic-workspace/kde
diff --git a/from-callmetango/plasma-workspace/kde-fingerprint b/sonic-workspace/kde-fingerprint
similarity index 100%
rename from from-callmetango/plasma-workspace/kde-fingerprint
rename to sonic-workspace/kde-fingerprint
diff --git a/from-callmetango/plasma-workspace/kde-smartcard b/sonic-workspace/kde-smartcard
similarity index 100%
rename from from-callmetango/plasma-workspace/kde-smartcard
rename to sonic-workspace/kde-smartcard
diff --git a/from-callmetango/plasma-workspace/plasma-workspace-5.27.80-enable-lock-logout-action.patch b/sonic-workspace/plasma-workspace-5.27.80-enable-lock-logout-action.patch
similarity index 100%
rename from from-callmetango/plasma-workspace/plasma-workspace-5.27.80-enable-lock-logout-action.patch
rename to sonic-workspace/plasma-workspace-5.27.80-enable-lock-logout-action.patch
diff --git a/from-callmetango/plasma-workspace/plasma-workspace-5.27.80-enable-open-terminal-action.patch b/sonic-workspace/plasma-workspace-5.27.80-enable-open-terminal-action.patch
similarity index 100%
rename from from-callmetango/plasma-workspace/plasma-workspace-5.27.80-enable-open-terminal-action.patch
rename to sonic-workspace/plasma-workspace-5.27.80-enable-open-terminal-action.patch
diff --git a/from-callmetango/plasma-workspace/plasma-workspace.spec b/sonic-workspace/sonic-workspace.spec
similarity index 100%
rename from from-callmetango/plasma-workspace/plasma-workspace.spec
rename to sonic-workspace/sonic-workspace.spec
diff --git a/from-callmetango/plasma-workspace/spice-vdagent.conf b/sonic-workspace/spice-vdagent.conf
similarity index 100%
rename from from-callmetango/plasma-workspace/spice-vdagent.conf
rename to sonic-workspace/spice-vdagent.conf
diff --git a/from-callmetango/plasma-workspace/ssh-agent.conf b/sonic-workspace/ssh-agent.conf
similarity index 100%
rename from from-callmetango/plasma-workspace/ssh-agent.conf
rename to sonic-workspace/ssh-agent.conf
diff --git a/from-callmetango/plasma-workspace/startkderc b/sonic-workspace/startkderc
similarity index 100%
rename from from-callmetango/plasma-workspace/startkderc
rename to sonic-workspace/startkderc
diff --git a/from-callmetango/plasma-workspace/tree.txt b/sonic-workspace/tree.txt
similarity index 100%
rename from from-callmetango/plasma-workspace/tree.txt
rename to sonic-workspace/tree.txt