diff --git a/parch-base/PKGBUILD b/base/parch-base/PKGBUILD
similarity index 100%
rename from parch-base/PKGBUILD
rename to base/parch-base/PKGBUILD
diff --git a/parch-bluetooth/PKGBUILD b/base/parch-bluetooth/PKGBUILD
similarity index 100%
rename from parch-bluetooth/PKGBUILD
rename to base/parch-bluetooth/PKGBUILD
diff --git a/parch-bluetooth/bluetooth.install b/base/parch-bluetooth/bluetooth.install
similarity index 100%
rename from parch-bluetooth/bluetooth.install
rename to base/parch-bluetooth/bluetooth.install
diff --git a/parch-config-cinnamon/.INSTALL b/base/parch-config-cinnamon/.INSTALL
similarity index 100%
rename from parch-config-cinnamon/.INSTALL
rename to base/parch-config-cinnamon/.INSTALL
diff --git a/parch-config-cinnamon/.PKGINFO b/base/parch-config-cinnamon/.PKGINFO
similarity index 100%
rename from parch-config-cinnamon/.PKGINFO
rename to base/parch-config-cinnamon/.PKGINFO
diff --git a/parch-config-cinnamon/.gitignore b/base/parch-config-cinnamon/.gitignore
similarity index 100%
rename from parch-config-cinnamon/.gitignore
rename to base/parch-config-cinnamon/.gitignore
diff --git a/parch-config-cinnamon/PKGBUILD b/base/parch-config-cinnamon/PKGBUILD
similarity index 100%
rename from parch-config-cinnamon/PKGBUILD
rename to base/parch-config-cinnamon/PKGBUILD
diff --git a/parch-config-cinnamon/src/etc/skel/.config/X-Cinnamon-xdg-terminals.list b/base/parch-config-cinnamon/src/etc/skel/.config/X-Cinnamon-xdg-terminals.list
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/X-Cinnamon-xdg-terminals.list
rename to base/parch-config-cinnamon/src/etc/skel/.config/X-Cinnamon-xdg-terminals.list
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon-monitors.xml b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon-monitors.xml
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon-monitors.xml
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon-monitors.xml
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon-monitors.xml~ b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon-monitors.xml~
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon-monitors.xml~
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon-monitors.xml~
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/backgrounds/user-folders.lst b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/backgrounds/user-folders.lst
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/backgrounds/user-folders.lst
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/backgrounds/user-folders.lst
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/calendar@cinnamon.org/13.json b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/calendar@cinnamon.org/13.json
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/calendar@cinnamon.org/13.json
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/calendar@cinnamon.org/13.json
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/cornerbar@cinnamon.org/14.json b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/cornerbar@cinnamon.org/14.json
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/cornerbar@cinnamon.org/14.json
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/cornerbar@cinnamon.org/14.json
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/favorites@cinnamon.org/9.json b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/favorites@cinnamon.org/9.json
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/favorites@cinnamon.org/9.json
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/favorites@cinnamon.org/9.json
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/grouped-window-list@cinnamon.org/2.json b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/grouped-window-list@cinnamon.org/2.json
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/grouped-window-list@cinnamon.org/2.json
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/grouped-window-list@cinnamon.org/2.json
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/menu@cinnamon.org/0.json b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/menu@cinnamon.org/0.json
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/menu@cinnamon.org/0.json
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/menu@cinnamon.org/0.json
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/network@cinnamon.org/network@cinnamon.org.json b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/network@cinnamon.org/network@cinnamon.org.json
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/network@cinnamon.org/network@cinnamon.org.json
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/network@cinnamon.org/network@cinnamon.org.json
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/notifications@cinnamon.org/notifications@cinnamon.org.json b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/notifications@cinnamon.org/notifications@cinnamon.org.json
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/notifications@cinnamon.org/notifications@cinnamon.org.json
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/notifications@cinnamon.org/notifications@cinnamon.org.json
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/power@cinnamon.org/power@cinnamon.org.json b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/power@cinnamon.org/power@cinnamon.org.json
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/power@cinnamon.org/power@cinnamon.org.json
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/power@cinnamon.org/power@cinnamon.org.json
diff --git a/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/sound@cinnamon.org/sound@cinnamon.org.json b/base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/sound@cinnamon.org/sound@cinnamon.org.json
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/sound@cinnamon.org/sound@cinnamon.org.json
rename to base/parch-config-cinnamon/src/etc/skel/.config/cinnamon/spices/sound@cinnamon.org/sound@cinnamon.org.json
diff --git a/parch-config-cinnamon/src/etc/skel/.config/dconf/user b/base/parch-config-cinnamon/src/etc/skel/.config/dconf/user
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/dconf/user
rename to base/parch-config-cinnamon/src/etc/skel/.config/dconf/user
diff --git a/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/user-chrome-apps.menu b/base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/user-chrome-apps.menu
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/user-chrome-apps.menu
rename to base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/user-chrome-apps.menu
diff --git a/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Bazi Ba Kalamat.menu b/base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Bazi Ba Kalamat.menu
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Bazi Ba Kalamat.menu
rename to base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Bazi Ba Kalamat.menu
diff --git a/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Readme.menu b/base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Readme.menu
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Readme.menu
rename to base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Readme.menu
diff --git a/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Remove Bazi Ba Kalamat.menu b/base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Remove Bazi Ba Kalamat.menu
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Remove Bazi Ba Kalamat.menu
rename to base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/wine-Programs-Bazi Ba Kalamat-Remove Bazi Ba Kalamat.menu
diff --git a/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/xdg-desktop-menu-dummy.menu b/base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/xdg-desktop-menu-dummy.menu
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/xdg-desktop-menu-dummy.menu
rename to base/parch-config-cinnamon/src/etc/skel/.config/menus/cinnamon-applications-merged/xdg-desktop-menu-dummy.menu
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db b/base/parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db-shm b/base/parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db-shm
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db-shm
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db-shm
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db-wal b/base/parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db-wal
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db-wal
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/bookmarks.db-wal
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/config b/base/parch-config-cinnamon/src/etc/skel/.config/midori/config
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/config
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/config
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/cookies b/base/parch-config-cinnamon/src/etc/skel/.config/midori/cookies
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/cookies
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/cookies
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/history.db b/base/parch-config-cinnamon/src/etc/skel/.config/midori/history.db
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/history.db
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/history.db
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/history.db-shm b/base/parch-config-cinnamon/src/etc/skel/.config/midori/history.db-shm
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/history.db-shm
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/history.db-shm
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/history.db-wal b/base/parch-config-cinnamon/src/etc/skel/.config/midori/history.db-wal
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/history.db-wal
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/history.db-wal
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db b/base/parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db-shm b/base/parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db-shm
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db-shm
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db-shm
diff --git a/parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db-wal b/base/parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db-wal
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db-wal
rename to base/parch-config-cinnamon/src/etc/skel/.config/midori/tabby.db-wal
diff --git a/parch-config-cinnamon/src/etc/skel/.config/nemo/desktop-metadata b/base/parch-config-cinnamon/src/etc/skel/.config/nemo/desktop-metadata
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/nemo/desktop-metadata
rename to base/parch-config-cinnamon/src/etc/skel/.config/nemo/desktop-metadata
diff --git a/parch-config-cinnamon/src/etc/skel/.config/pulse/cookie b/base/parch-config-cinnamon/src/etc/skel/.config/pulse/cookie
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/pulse/cookie
rename to base/parch-config-cinnamon/src/etc/skel/.config/pulse/cookie
diff --git a/parch-config-cinnamon/src/etc/skel/.config/xdg-terminals.list b/base/parch-config-cinnamon/src/etc/skel/.config/xdg-terminals.list
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.config/xdg-terminals.list
rename to base/parch-config-cinnamon/src/etc/skel/.config/xdg-terminals.list
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/Emote/user_data b/base/parch-config-cinnamon/src/etc/skel/.local/share/Emote/user_data
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/Emote/user_data
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/Emote/user_data
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/gvfs-metadata/home b/base/parch-config-cinnamon/src/etc/skel/.local/share/gvfs-metadata/home
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/gvfs-metadata/home
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/gvfs-metadata/home
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/keyrings/login.keyring b/base/parch-config-cinnamon/src/etc/skel/.local/share/keyrings/login.keyring
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/keyrings/login.keyring
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/keyrings/login.keyring
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/keyrings/user.keystore b/base/parch-config-cinnamon/src/etc/skel/.local/share/keyrings/user.keystore
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/keyrings/user.keystore
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/keyrings/user.keystore
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/recently-used.xbel b/base/parch-config-cinnamon/src/etc/skel/.local/share/recently-used.xbel
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/recently-used.xbel
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/recently-used.xbel
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/webkitgtk/storage/salt b/base/parch-config-cinnamon/src/etc/skel/.local/share/webkitgtk/storage/salt
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/webkitgtk/storage/salt
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/webkitgtk/storage/salt
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite b/base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite-shm b/base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite-shm
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite-shm
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite-shm
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite-wal b/base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite-wal
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite-wal
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/activity.sqlite-wal
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/flintlock b/base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/flintlock
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/flintlock
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/flintlock
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/iamglass b/base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/iamglass
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/iamglass
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/iamglass
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/position.glass b/base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/position.glass
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/position.glass
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/position.glass
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/postlist.glass b/base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/postlist.glass
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/postlist.glass
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/postlist.glass
diff --git a/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/termlist.glass b/base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/termlist.glass
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/termlist.glass
rename to base/parch-config-cinnamon/src/etc/skel/.local/share/zeitgeist/fts.index/termlist.glass
diff --git a/parch-config-cinnamon/src/etc/skel/.local/state/lesshst b/base/parch-config-cinnamon/src/etc/skel/.local/state/lesshst
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/state/lesshst
rename to base/parch-config-cinnamon/src/etc/skel/.local/state/lesshst
diff --git a/parch-config-cinnamon/src/etc/skel/.local/state/wireplumber/default-routes b/base/parch-config-cinnamon/src/etc/skel/.local/state/wireplumber/default-routes
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/state/wireplumber/default-routes
rename to base/parch-config-cinnamon/src/etc/skel/.local/state/wireplumber/default-routes
diff --git a/parch-config-cinnamon/src/etc/skel/.local/state/wireplumber/restore-stream b/base/parch-config-cinnamon/src/etc/skel/.local/state/wireplumber/restore-stream
similarity index 100%
rename from parch-config-cinnamon/src/etc/skel/.local/state/wireplumber/restore-stream
rename to base/parch-config-cinnamon/src/etc/skel/.local/state/wireplumber/restore-stream
diff --git a/parch-config-i3/.gitignore b/base/parch-config-i3/.gitignore
similarity index 100%
rename from parch-config-i3/.gitignore
rename to base/parch-config-i3/.gitignore
diff --git a/parch-config-i3/PKGBUILD b/base/parch-config-i3/PKGBUILD
similarity index 100%
rename from parch-config-i3/PKGBUILD
rename to base/parch-config-i3/PKGBUILD
diff --git a/parch-config-i3/src/etc/skel/.config/i3/config b/base/parch-config-i3/src/etc/skel/.config/i3/config
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/i3/config
rename to base/parch-config-i3/src/etc/skel/.config/i3/config
diff --git a/parch-config-i3/src/etc/skel/.config/i3/walp.jpg b/base/parch-config-i3/src/etc/skel/.config/i3/walp.jpg
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/i3/walp.jpg
rename to base/parch-config-i3/src/etc/skel/.config/i3/walp.jpg
diff --git a/parch-config-i3/src/etc/skel/.config/kitty/colors.conf b/base/parch-config-i3/src/etc/skel/.config/kitty/colors.conf
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/kitty/colors.conf
rename to base/parch-config-i3/src/etc/skel/.config/kitty/colors.conf
diff --git a/parch-config-i3/src/etc/skel/.config/kitty/current-theme.conf b/base/parch-config-i3/src/etc/skel/.config/kitty/current-theme.conf
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/kitty/current-theme.conf
rename to base/parch-config-i3/src/etc/skel/.config/kitty/current-theme.conf
diff --git a/parch-config-i3/src/etc/skel/.config/kitty/kitty.conf b/base/parch-config-i3/src/etc/skel/.config/kitty/kitty.conf
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/kitty/kitty.conf
rename to base/parch-config-i3/src/etc/skel/.config/kitty/kitty.conf
diff --git a/parch-config-i3/src/etc/skel/.config/kitty/kitty.conf.bak b/base/parch-config-i3/src/etc/skel/.config/kitty/kitty.conf.bak
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/kitty/kitty.conf.bak
rename to base/parch-config-i3/src/etc/skel/.config/kitty/kitty.conf.bak
diff --git a/parch-config-i3/src/etc/skel/.config/kitty/tab_bar.py b/base/parch-config-i3/src/etc/skel/.config/kitty/tab_bar.py
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/kitty/tab_bar.py
rename to base/parch-config-i3/src/etc/skel/.config/kitty/tab_bar.py
diff --git a/parch-config-i3/src/etc/skel/.config/kitty/theme.conf b/base/parch-config-i3/src/etc/skel/.config/kitty/theme.conf
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/kitty/theme.conf
rename to base/parch-config-i3/src/etc/skel/.config/kitty/theme.conf
diff --git a/parch-config-i3/src/etc/skel/.config/picom.conf b/base/parch-config-i3/src/etc/skel/.config/picom.conf
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/picom.conf
rename to base/parch-config-i3/src/etc/skel/.config/picom.conf
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/config b/base/parch-config-i3/src/etc/skel/.config/polybar/config
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/config
rename to base/parch-config-i3/src/etc/skel/.config/polybar/config
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/launch.sh b/base/parch-config-i3/src/etc/skel/.config/polybar/launch.sh
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/launch.sh
rename to base/parch-config-i3/src/etc/skel/.config/polybar/launch.sh
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/scripts/check-arch-updates.sh b/base/parch-config-i3/src/etc/skel/.config/polybar/scripts/check-arch-updates.sh
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/scripts/check-arch-updates.sh
rename to base/parch-config-i3/src/etc/skel/.config/polybar/scripts/check-arch-updates.sh
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/scripts/check-aur-updates.sh b/base/parch-config-i3/src/etc/skel/.config/polybar/scripts/check-aur-updates.sh
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/scripts/check-aur-updates.sh
rename to base/parch-config-i3/src/etc/skel/.config/polybar/scripts/check-aur-updates.sh
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/scripts/get_spotify_status.sh b/base/parch-config-i3/src/etc/skel/.config/polybar/scripts/get_spotify_status.sh
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/scripts/get_spotify_status.sh
rename to base/parch-config-i3/src/etc/skel/.config/polybar/scripts/get_spotify_status.sh
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/scripts/pavolume.sh b/base/parch-config-i3/src/etc/skel/.config/polybar/scripts/pavolume.sh
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/scripts/pavolume.sh
rename to base/parch-config-i3/src/etc/skel/.config/polybar/scripts/pavolume.sh
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/scripts/pub-ip.sh b/base/parch-config-i3/src/etc/skel/.config/polybar/scripts/pub-ip.sh
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/scripts/pub-ip.sh
rename to base/parch-config-i3/src/etc/skel/.config/polybar/scripts/pub-ip.sh
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/scripts/scroll_spotify_status.sh b/base/parch-config-i3/src/etc/skel/.config/polybar/scripts/scroll_spotify_status.sh
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/scripts/scroll_spotify_status.sh
rename to base/parch-config-i3/src/etc/skel/.config/polybar/scripts/scroll_spotify_status.sh
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/scripts/spotify1.sh b/base/parch-config-i3/src/etc/skel/.config/polybar/scripts/spotify1.sh
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/scripts/spotify1.sh
rename to base/parch-config-i3/src/etc/skel/.config/polybar/scripts/spotify1.sh
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/scripts/tempcores.sh b/base/parch-config-i3/src/etc/skel/.config/polybar/scripts/tempcores.sh
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/scripts/tempcores.sh
rename to base/parch-config-i3/src/etc/skel/.config/polybar/scripts/tempcores.sh
diff --git a/parch-config-i3/src/etc/skel/.config/polybar/scripts/weather.py b/base/parch-config-i3/src/etc/skel/.config/polybar/scripts/weather.py
similarity index 100%
rename from parch-config-i3/src/etc/skel/.config/polybar/scripts/weather.py
rename to base/parch-config-i3/src/etc/skel/.config/polybar/scripts/weather.py
diff --git a/parch-config-i3/src/etc/skel/.local/bin/get_song b/base/parch-config-i3/src/etc/skel/.local/bin/get_song
similarity index 100%
rename from parch-config-i3/src/etc/skel/.local/bin/get_song
rename to base/parch-config-i3/src/etc/skel/.local/bin/get_song
diff --git a/parch-config-zsh/.BUILDINFO b/base/parch-config-zsh/.BUILDINFO
similarity index 100%
rename from parch-config-zsh/.BUILDINFO
rename to base/parch-config-zsh/.BUILDINFO
diff --git a/parch-config-zsh/.MTREE b/base/parch-config-zsh/.MTREE
similarity index 100%
rename from parch-config-zsh/.MTREE
rename to base/parch-config-zsh/.MTREE
diff --git a/parch-config-zsh/.PKGINFO b/base/parch-config-zsh/.PKGINFO
similarity index 100%
rename from parch-config-zsh/.PKGINFO
rename to base/parch-config-zsh/.PKGINFO
diff --git a/parch-config-zsh/PKGBUILD b/base/parch-config-zsh/PKGBUILD
similarity index 100%
rename from parch-config-zsh/PKGBUILD
rename to base/parch-config-zsh/PKGBUILD
diff --git a/parch-livecd-desktop/PKGBUILD b/base/parch-livecd-desktop/PKGBUILD
similarity index 100%
rename from parch-livecd-desktop/PKGBUILD
rename to base/parch-livecd-desktop/PKGBUILD
diff --git a/parch-nix/PKGBUILD b/base/parch-nix/PKGBUILD
similarity index 100%
rename from parch-nix/PKGBUILD
rename to base/parch-nix/PKGBUILD
diff --git a/parch-nix/nix.install b/base/parch-nix/nix.install
similarity index 100%
rename from parch-nix/nix.install
rename to base/parch-nix/nix.install
diff --git a/parch-plymouth/PKGBUILD b/base/parch-plymouth/PKGBUILD
similarity index 100%
rename from parch-plymouth/PKGBUILD
rename to base/parch-plymouth/PKGBUILD
diff --git a/parch-plymouth/parch.install b/base/parch-plymouth/parch.install
similarity index 100%
rename from parch-plymouth/parch.install
rename to base/parch-plymouth/parch.install
diff --git a/parch-printer/PKGBUILD b/base/parch-printer/PKGBUILD
similarity index 100%
rename from parch-printer/PKGBUILD
rename to base/parch-printer/PKGBUILD
diff --git a/parch-printer/printer.install b/base/parch-printer/printer.install
similarity index 100%
rename from parch-printer/printer.install
rename to base/parch-printer/printer.install
diff --git a/parch-tweaks/PKGBUILD b/base/parch-tweaks/PKGBUILD
similarity index 100%
rename from parch-tweaks/PKGBUILD
rename to base/parch-tweaks/PKGBUILD
diff --git a/parchinstaller/PKGBUILD b/base/parchinstaller/PKGBUILD
similarity index 100%
rename from parchinstaller/PKGBUILD
rename to base/parchinstaller/PKGBUILD
diff --git a/parchinstaller/parch.install b/base/parchinstaller/parch.install
similarity index 100%
rename from parchinstaller/parch.install
rename to base/parchinstaller/parch.install
diff --git a/create_pkg b/create_pkg
deleted file mode 100755
index ee28229..0000000
--- a/create_pkg
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# set -x
-
-read -p "Please enter pkg name:" pkg_name
-read -p "Please enter version:" pkg_ver
-read -ep "Please enter description:" pkg_desc
-read -ep "Please enter dependences: " pkg_deps
-
-pkg_verbose="$1"
-
-if ! [[ $pkg_verbose -eq "-v" || $pkg_verbose -eq "--verbose" ]]; then
-    pkg_verbose=""
-fi
-
-mkdir -p $pkg_name $pkg_verbose
-
-pkg_file="${pkg_name}/PKGBUILD"
-
-cp .PKGBUILD.template $pkg_file $pkg_verbose
-
-sed -i -e "s/{pkg_name}/${pkg_name}/g" $pkg_file
-sed -i -e "s/{pkg_ver}/${pkg_ver}/g" $pkg_file
-sed -i -e "s/{pkg_desc}/${pkg_desc}/g" $pkg_file
-sed -i -e "s/{pkg_deps}/${pkg_deps}/g" $pkg_file
diff --git a/gnome-control-center/PKGBUILD b/gnome/gnome-control-center/PKGBUILD
similarity index 100%
rename from gnome-control-center/PKGBUILD
rename to gnome/gnome-control-center/PKGBUILD
diff --git a/gnome-software-packagekit/.SRCINFO b/gnome/gnome-software-packagekit/.SRCINFO
similarity index 100%
rename from gnome-software-packagekit/.SRCINFO
rename to gnome/gnome-software-packagekit/.SRCINFO
diff --git a/gnome-software-packagekit/PKGBUILD b/gnome/gnome-software-packagekit/PKGBUILD
similarity index 100%
rename from gnome-software-packagekit/PKGBUILD
rename to gnome/gnome-software-packagekit/PKGBUILD
diff --git a/parch-gnome-meta/PKGBUILD b/gnome/parch-gnome-meta/PKGBUILD
similarity index 100%
rename from parch-gnome-meta/PKGBUILD
rename to gnome/parch-gnome-meta/PKGBUILD
diff --git a/parch-config-i3/src/etc/skel/.config/kitty/kitty-themes b/parch-config-i3/src/etc/skel/.config/kitty/kitty-themes
deleted file mode 160000
index b1abdd5..0000000
--- a/parch-config-i3/src/etc/skel/.config/kitty/kitty-themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b1abdd54ba655ef34f75a568d78625981bf1722c
diff --git a/parch-plasma-meta/PKGBUILD b/plasma/parch-plasma-meta/PKGBUILD
similarity index 100%
rename from parch-plasma-meta/PKGBUILD
rename to plasma/parch-plasma-meta/PKGBUILD
diff --git a/catppuccin-gtk-theme-macchiato/.SRCINFO b/theme/catppuccin-gtk-theme-macchiato/.SRCINFO
similarity index 100%
rename from catppuccin-gtk-theme-macchiato/.SRCINFO
rename to theme/catppuccin-gtk-theme-macchiato/.SRCINFO
diff --git a/catppuccin-gtk-theme-macchiato/.gitignore b/theme/catppuccin-gtk-theme-macchiato/.gitignore
similarity index 100%
rename from catppuccin-gtk-theme-macchiato/.gitignore
rename to theme/catppuccin-gtk-theme-macchiato/.gitignore
diff --git a/catppuccin-gtk-theme-macchiato/PKGBUILD b/theme/catppuccin-gtk-theme-macchiato/PKGBUILD
similarity index 100%
rename from catppuccin-gtk-theme-macchiato/PKGBUILD
rename to theme/catppuccin-gtk-theme-macchiato/PKGBUILD
diff --git a/multicolor-sddm-theme/PKGBUILD b/theme/multicolor-sddm-theme/PKGBUILD
similarity index 100%
rename from multicolor-sddm-theme/PKGBUILD
rename to theme/multicolor-sddm-theme/PKGBUILD
diff --git a/parch-mpv/PKGBUILD b/theme/parch-mpv/PKGBUILD
similarity index 100%
rename from parch-mpv/PKGBUILD
rename to theme/parch-mpv/PKGBUILD
diff --git a/blackarch-mirrors/PKGBUILD b/www/blackarch-mirrors/PKGBUILD
similarity index 100%
rename from blackarch-mirrors/PKGBUILD
rename to www/blackarch-mirrors/PKGBUILD
diff --git a/blackarch-mirrors/blackarch-install b/www/blackarch-mirrors/blackarch-install
similarity index 100%
rename from blackarch-mirrors/blackarch-install
rename to www/blackarch-mirrors/blackarch-install
diff --git a/blackarch-mirrors/blackarch.install b/www/blackarch-mirrors/blackarch.install
similarity index 100%
rename from blackarch-mirrors/blackarch.install
rename to www/blackarch-mirrors/blackarch.install
diff --git a/chaotic-aur/PKGBUILD b/www/chaotic-aur/PKGBUILD
similarity index 100%
rename from chaotic-aur/PKGBUILD
rename to www/chaotic-aur/PKGBUILD
diff --git a/chaotic-aur/chaotic-install b/www/chaotic-aur/chaotic-install
similarity index 100%
rename from chaotic-aur/chaotic-install
rename to www/chaotic-aur/chaotic-install
diff --git a/chaotic-aur/chaotic.install b/www/chaotic-aur/chaotic.install
similarity index 100%
rename from chaotic-aur/chaotic.install
rename to www/chaotic-aur/chaotic.install