diff --git a/setup/linux/packages/live_add b/setup/linux/packages/base
similarity index 100%
rename from setup/linux/packages/live_add
rename to setup/linux/packages/base
diff --git a/setup/linux/packages/live_add_x b/setup/linux/packages/gui
similarity index 100%
rename from setup/linux/packages/live_add_x
rename to setup/linux/packages/gui
diff --git a/setup/linux/packages/live_add_min b/setup/linux/packages/live_add_min
deleted file mode 100644
index b37bdc74..00000000
--- a/setup/linux/packages/live_add_min
+++ /dev/null
@@ -1,2 +0,0 @@
-linux-headers
-macbook12-spi-driver-dkms
diff --git a/setup/linux/packages/live_remove b/setup/linux/packages/live_remove
deleted file mode 100644
index 2e1ffbe7..00000000
--- a/setup/linux/packages/live_remove
+++ /dev/null
@@ -1,21 +0,0 @@
-arch-install-scripts
-b43-fwcutter
-darkhttpd
-gpm
-grml-zsh-config
-grub
-irssi
-mc
-openvpn
-ppp
-pptpclient
-refind-efi
-rp-pppoe
-smartmontools
-speedtouch
-testdisk
-wpa_actiond
-vim-minimal
-vpnc
-wvdial
-xl2tpd
diff --git a/setup/linux/include/EFI/boot/icons/dgpu.png b/setup/linux/profile_base/EFI/boot/icons/dgpu.png
similarity index 100%
rename from setup/linux/include/EFI/boot/icons/dgpu.png
rename to setup/linux/profile_base/EFI/boot/icons/dgpu.png
diff --git a/setup/linux/include/EFI/boot/icons/wk_arch.png b/setup/linux/profile_base/EFI/boot/icons/wk_arch.png
similarity index 100%
rename from setup/linux/include/EFI/boot/icons/wk_arch.png
rename to setup/linux/profile_base/EFI/boot/icons/wk_arch.png
diff --git a/setup/linux/include/EFI/boot/icons/wk_memtest.png b/setup/linux/profile_base/EFI/boot/icons/wk_memtest.png
similarity index 100%
rename from setup/linux/include/EFI/boot/icons/wk_memtest.png
rename to setup/linux/profile_base/EFI/boot/icons/wk_memtest.png
diff --git a/setup/linux/include/EFI/boot/icons/wk_win.png b/setup/linux/profile_base/EFI/boot/icons/wk_win.png
similarity index 100%
rename from setup/linux/include/EFI/boot/icons/wk_win.png
rename to setup/linux/profile_base/EFI/boot/icons/wk_win.png
diff --git a/setup/linux/include/EFI/boot/refind.conf b/setup/linux/profile_base/EFI/boot/refind.conf
similarity index 100%
rename from setup/linux/include/EFI/boot/refind.conf
rename to setup/linux/profile_base/EFI/boot/refind.conf
diff --git a/setup/linux/include/EFI/boot/selection_big.png b/setup/linux/profile_base/EFI/boot/selection_big.png
similarity index 100%
rename from setup/linux/include/EFI/boot/selection_big.png
rename to setup/linux/profile_base/EFI/boot/selection_big.png
diff --git a/setup/linux/include/EFI/boot/selection_small.png b/setup/linux/profile_base/EFI/boot/selection_small.png
similarity index 100%
rename from setup/linux/include/EFI/boot/selection_small.png
rename to setup/linux/profile_base/EFI/boot/selection_small.png
diff --git a/setup/linux/include/airootfs/etc/default/ufw b/setup/linux/profile_base/airootfs/etc/default/ufw
similarity index 100%
rename from setup/linux/include/airootfs/etc/default/ufw
rename to setup/linux/profile_base/airootfs/etc/default/ufw
diff --git a/setup/linux/include/airootfs/etc/hostname b/setup/linux/profile_base/airootfs/etc/hostname
similarity index 100%
rename from setup/linux/include/airootfs/etc/hostname
rename to setup/linux/profile_base/airootfs/etc/hostname
diff --git a/setup/linux/include/airootfs/etc/hosts b/setup/linux/profile_base/airootfs/etc/hosts
similarity index 100%
rename from setup/linux/include/airootfs/etc/hosts
rename to setup/linux/profile_base/airootfs/etc/hosts
diff --git a/setup/linux/include/airootfs/etc/locale.conf b/setup/linux/profile_base/airootfs/etc/locale.conf
similarity index 100%
rename from setup/linux/include/airootfs/etc/locale.conf
rename to setup/linux/profile_base/airootfs/etc/locale.conf
diff --git a/setup/linux/include/airootfs/etc/locale.gen b/setup/linux/profile_base/airootfs/etc/locale.gen
similarity index 100%
rename from setup/linux/include/airootfs/etc/locale.gen
rename to setup/linux/profile_base/airootfs/etc/locale.gen
diff --git a/setup/linux/include/airootfs/etc/motd b/setup/linux/profile_base/airootfs/etc/motd
similarity index 100%
rename from setup/linux/include/airootfs/etc/motd
rename to setup/linux/profile_base/airootfs/etc/motd
diff --git a/setup/linux/include/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules b/setup/linux/profile_base/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules
similarity index 100%
rename from setup/linux/include/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules
rename to setup/linux/profile_base/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules
diff --git a/setup/linux/include/airootfs/etc/skel/.aliases b/setup/linux/profile_base/airootfs/etc/skel/.aliases
similarity index 100%
rename from setup/linux/include/airootfs/etc/skel/.aliases
rename to setup/linux/profile_base/airootfs/etc/skel/.aliases
diff --git a/setup/linux/include/airootfs/etc/skel/.bashrc b/setup/linux/profile_base/airootfs/etc/skel/.bashrc
similarity index 100%
rename from setup/linux/include/airootfs/etc/skel/.bashrc
rename to setup/linux/profile_base/airootfs/etc/skel/.bashrc
diff --git a/setup/linux/include/airootfs/etc/skel/.dircolors b/setup/linux/profile_base/airootfs/etc/skel/.dircolors
similarity index 100%
rename from setup/linux/include/airootfs/etc/skel/.dircolors
rename to setup/linux/profile_base/airootfs/etc/skel/.dircolors
diff --git a/setup/linux/include/airootfs/etc/skel/.rsync_exclusions b/setup/linux/profile_base/airootfs/etc/skel/.rsync_exclusions
similarity index 100%
rename from setup/linux/include/airootfs/etc/skel/.rsync_exclusions
rename to setup/linux/profile_base/airootfs/etc/skel/.rsync_exclusions
diff --git a/setup/linux/include/airootfs/etc/skel/.tmux.conf b/setup/linux/profile_base/airootfs/etc/skel/.tmux.conf
similarity index 100%
rename from setup/linux/include/airootfs/etc/skel/.tmux.conf
rename to setup/linux/profile_base/airootfs/etc/skel/.tmux.conf
diff --git a/setup/linux/include/airootfs/etc/skel/.update_network b/setup/linux/profile_base/airootfs/etc/skel/.update_network
similarity index 100%
rename from setup/linux/include/airootfs/etc/skel/.update_network
rename to setup/linux/profile_base/airootfs/etc/skel/.update_network
diff --git a/setup/linux/include/airootfs/etc/skel/.vimrc b/setup/linux/profile_base/airootfs/etc/skel/.vimrc
similarity index 100%
rename from setup/linux/include/airootfs/etc/skel/.vimrc
rename to setup/linux/profile_base/airootfs/etc/skel/.vimrc
diff --git a/setup/linux/include/airootfs/etc/skel/.zlogin b/setup/linux/profile_base/airootfs/etc/skel/.zlogin
similarity index 100%
rename from setup/linux/include/airootfs/etc/skel/.zlogin
rename to setup/linux/profile_base/airootfs/etc/skel/.zlogin
diff --git a/setup/linux/include/airootfs/etc/skel/.zshrc b/setup/linux/profile_base/airootfs/etc/skel/.zshrc
similarity index 100%
rename from setup/linux/include/airootfs/etc/skel/.zshrc
rename to setup/linux/profile_base/airootfs/etc/skel/.zshrc
diff --git a/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
similarity index 100%
rename from setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
rename to setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
diff --git a/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service b/setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
similarity index 100%
rename from setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
rename to setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
diff --git a/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
similarity index 100%
rename from setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
rename to setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
diff --git a/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service b/setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
similarity index 100%
rename from setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
rename to setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
diff --git a/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service b/setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
similarity index 100%
rename from setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
rename to setup/linux/profile_base/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
diff --git a/setup/linux/include/airootfs/etc/udev/rules.d/99-udisks2.rules b/setup/linux/profile_base/airootfs/etc/udev/rules.d/99-udisks2.rules
similarity index 100%
rename from setup/linux/include/airootfs/etc/udev/rules.d/99-udisks2.rules
rename to setup/linux/profile_base/airootfs/etc/udev/rules.d/99-udisks2.rules
diff --git a/setup/linux/include/airootfs/etc/udevil/udevil.conf b/setup/linux/profile_base/airootfs/etc/udevil/udevil.conf
similarity index 100%
rename from setup/linux/include/airootfs/etc/udevil/udevil.conf
rename to setup/linux/profile_base/airootfs/etc/udevil/udevil.conf
diff --git a/setup/linux/include/airootfs/etc/ufw/ufw.conf b/setup/linux/profile_base/airootfs/etc/ufw/ufw.conf
similarity index 100%
rename from setup/linux/include/airootfs/etc/ufw/ufw.conf
rename to setup/linux/profile_base/airootfs/etc/ufw/ufw.conf
diff --git a/setup/linux/include/airootfs/etc/ufw/user.rules b/setup/linux/profile_base/airootfs/etc/ufw/user.rules
similarity index 100%
rename from setup/linux/include/airootfs/etc/ufw/user.rules
rename to setup/linux/profile_base/airootfs/etc/ufw/user.rules
diff --git a/setup/linux/include/airootfs/etc/ufw/user6.rules b/setup/linux/profile_base/airootfs/etc/ufw/user6.rules
similarity index 100%
rename from setup/linux/include/airootfs/etc/ufw/user6.rules
rename to setup/linux/profile_base/airootfs/etc/ufw/user6.rules
diff --git a/setup/linux/include/airootfs/etc/vconsole.conf b/setup/linux/profile_base/airootfs/etc/vconsole.conf
similarity index 100%
rename from setup/linux/include/airootfs/etc/vconsole.conf
rename to setup/linux/profile_base/airootfs/etc/vconsole.conf
diff --git a/setup/linux/include/isolinux/isolinux.cfg b/setup/linux/profile_base/isolinux/isolinux.cfg
similarity index 100%
rename from setup/linux/include/isolinux/isolinux.cfg
rename to setup/linux/profile_base/isolinux/isolinux.cfg
diff --git a/setup/linux/include/syslinux/splash.png b/setup/linux/profile_base/syslinux/splash.png
similarity index 100%
rename from setup/linux/include/syslinux/splash.png
rename to setup/linux/profile_base/syslinux/splash.png
diff --git a/setup/linux/include/syslinux/syslinux.cfg b/setup/linux/profile_base/syslinux/syslinux.cfg
similarity index 100%
rename from setup/linux/include/syslinux/syslinux.cfg
rename to setup/linux/profile_base/syslinux/syslinux.cfg
diff --git a/setup/linux/include/syslinux/wk.cfg b/setup/linux/profile_base/syslinux/wk.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk.cfg
rename to setup/linux/profile_base/syslinux/wk.cfg
diff --git a/setup/linux/include/syslinux/wk_hdt.cfg b/setup/linux/profile_base/syslinux/wk_hdt.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_hdt.cfg
rename to setup/linux/profile_base/syslinux/wk_hdt.cfg
diff --git a/setup/linux/include/syslinux/wk_head.cfg b/setup/linux/profile_base/syslinux/wk_head.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_head.cfg
rename to setup/linux/profile_base/syslinux/wk_head.cfg
diff --git a/setup/linux/include/syslinux/wk_iso.cfg b/setup/linux/profile_base/syslinux/wk_iso.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_iso.cfg
rename to setup/linux/profile_base/syslinux/wk_iso.cfg
diff --git a/setup/linux/include/syslinux/wk_iso_linux.cfg b/setup/linux/profile_base/syslinux/wk_iso_linux.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_iso_linux.cfg
rename to setup/linux/profile_base/syslinux/wk_iso_linux.cfg
diff --git a/setup/linux/include/syslinux/wk_pxe.cfg b/setup/linux/profile_base/syslinux/wk_pxe.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_pxe.cfg
rename to setup/linux/profile_base/syslinux/wk_pxe.cfg
diff --git a/setup/linux/include/syslinux/wk_pxe_linux.cfg b/setup/linux/profile_base/syslinux/wk_pxe_linux.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_pxe_linux.cfg
rename to setup/linux/profile_base/syslinux/wk_pxe_linux.cfg
diff --git a/setup/linux/include/syslinux/wk_pxe_winpe.cfg b/setup/linux/profile_base/syslinux/wk_pxe_winpe.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_pxe_winpe.cfg
rename to setup/linux/profile_base/syslinux/wk_pxe_winpe.cfg
diff --git a/setup/linux/include/syslinux/wk_sys.cfg b/setup/linux/profile_base/syslinux/wk_sys.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_sys.cfg
rename to setup/linux/profile_base/syslinux/wk_sys.cfg
diff --git a/setup/linux/include/syslinux/wk_sys_linux.cfg b/setup/linux/profile_base/syslinux/wk_sys_linux.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_sys_linux.cfg
rename to setup/linux/profile_base/syslinux/wk_sys_linux.cfg
diff --git a/setup/linux/include/syslinux/wk_sys_winpe.cfg b/setup/linux/profile_base/syslinux/wk_sys_winpe.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_sys_winpe.cfg
rename to setup/linux/profile_base/syslinux/wk_sys_winpe.cfg
diff --git a/setup/linux/include/syslinux/wk_tail.cfg b/setup/linux/profile_base/syslinux/wk_tail.cfg
similarity index 100%
rename from setup/linux/include/syslinux/wk_tail.cfg
rename to setup/linux/profile_base/syslinux/wk_tail.cfg
diff --git a/setup/linux/include_x/airootfs/etc/skel/.Xauthority b/setup/linux/profile_gui/airootfs/etc/skel/.Xauthority
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.Xauthority
rename to setup/linux/profile_gui/airootfs/etc/skel/.Xauthority
diff --git a/setup/linux/include_x/airootfs/etc/skel/.Xresources b/setup/linux/profile_gui/airootfs/etc/skel/.Xresources
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.Xresources
rename to setup/linux/profile_gui/airootfs/etc/skel/.Xresources
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/Thunar/accels.scm b/setup/linux/profile_gui/airootfs/etc/skel/.config/Thunar/accels.scm
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/Thunar/accels.scm
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/Thunar/accels.scm
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/Thunar/uca.xml b/setup/linux/profile_gui/airootfs/etc/skel/.config/Thunar/uca.xml
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/Thunar/uca.xml
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/Thunar/uca.xml
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/conky/base.conf b/setup/linux/profile_gui/airootfs/etc/skel/.config/conky/base.conf
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/conky/base.conf
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/conky/base.conf
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/dunst/dunstrc b/setup/linux/profile_gui/airootfs/etc/skel/.config/dunst/dunstrc
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/dunst/dunstrc
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/dunst/dunstrc
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/gtk-3.0/settings.ini b/setup/linux/profile_gui/airootfs/etc/skel/.config/gtk-3.0/settings.ini
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/gtk-3.0/settings.ini
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/gtk-3.0/settings.ini
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/i3/config b/setup/linux/profile_gui/airootfs/etc/skel/.config/i3/config
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/i3/config
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/i3/config
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/i3status/config b/setup/linux/profile_gui/airootfs/etc/skel/.config/i3status/config
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/i3status/config
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/i3status/config
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/mimeapps.list b/setup/linux/profile_gui/airootfs/etc/skel/.config/mimeapps.list
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/mimeapps.list
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/mimeapps.list
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/openbox/autostart b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/autostart
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/openbox/autostart
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/autostart
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/openbox/environment b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/environment
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/openbox/environment
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/environment
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/menu.xml
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/menu.xml
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/openbox/rc.xml b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/rc.xml
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/openbox/rc.xml
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/rc.xml
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/rofi/config b/setup/linux/profile_gui/airootfs/etc/skel/.config/rofi/config
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/rofi/config
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/rofi/config
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer b/setup/linux/profile_gui/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service b/setup/linux/profile_gui/airootfs/etc/skel/.config/systemd/user/update-conky.service
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/systemd/user/update-conky.service
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer b/setup/linux/profile_gui/airootfs/etc/skel/.config/systemd/user/update-conky.timer
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/systemd/user/update-conky.timer
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/tint2/tint2rc b/setup/linux/profile_gui/airootfs/etc/skel/.config/tint2/tint2rc
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/tint2/tint2rc
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/tint2/tint2rc
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/volumeicon/volumeicon b/setup/linux/profile_gui/airootfs/etc/skel/.config/volumeicon/volumeicon
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.config/volumeicon/volumeicon
rename to setup/linux/profile_gui/airootfs/etc/skel/.config/volumeicon/volumeicon
diff --git a/setup/linux/include_x/airootfs/etc/skel/.gtkrc-2.0 b/setup/linux/profile_gui/airootfs/etc/skel/.gtkrc-2.0
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.gtkrc-2.0
rename to setup/linux/profile_gui/airootfs/etc/skel/.gtkrc-2.0
diff --git a/setup/linux/include_x/airootfs/etc/skel/.start_desktop_apps b/setup/linux/profile_gui/airootfs/etc/skel/.start_desktop_apps
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.start_desktop_apps
rename to setup/linux/profile_gui/airootfs/etc/skel/.start_desktop_apps
diff --git a/setup/linux/include_x/airootfs/etc/skel/.update_conky b/setup/linux/profile_gui/airootfs/etc/skel/.update_conky
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.update_conky
rename to setup/linux/profile_gui/airootfs/etc/skel/.update_conky
diff --git a/setup/linux/include_x/airootfs/etc/skel/.update_x b/setup/linux/profile_gui/airootfs/etc/skel/.update_x
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.update_x
rename to setup/linux/profile_gui/airootfs/etc/skel/.update_x
diff --git a/setup/linux/include_x/airootfs/etc/skel/.wallpaper b/setup/linux/profile_gui/airootfs/etc/skel/.wallpaper
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.wallpaper
rename to setup/linux/profile_gui/airootfs/etc/skel/.wallpaper
diff --git a/setup/linux/include_x/airootfs/etc/skel/.xinitrc b/setup/linux/profile_gui/airootfs/etc/skel/.xinitrc
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.xinitrc
rename to setup/linux/profile_gui/airootfs/etc/skel/.xinitrc
diff --git a/setup/linux/include_x/airootfs/etc/skel/.zlogin b/setup/linux/profile_gui/airootfs/etc/skel/.zlogin
similarity index 100%
rename from setup/linux/include_x/airootfs/etc/skel/.zlogin
rename to setup/linux/profile_gui/airootfs/etc/skel/.zlogin
diff --git a/setup/linux/include_x/airootfs/usr/share/applications/Hardware Diagnostics.desktop b/setup/linux/profile_gui/airootfs/usr/share/applications/Hardware Diagnostics.desktop
similarity index 100%
rename from setup/linux/include_x/airootfs/usr/share/applications/Hardware Diagnostics.desktop
rename to setup/linux/profile_gui/airootfs/usr/share/applications/Hardware Diagnostics.desktop
diff --git a/setup/linux/include_x/airootfs/usr/share/applications/Hardware Information.desktop b/setup/linux/profile_gui/airootfs/usr/share/applications/Hardware Information.desktop
similarity index 100%
rename from setup/linux/include_x/airootfs/usr/share/applications/Hardware Information.desktop
rename to setup/linux/profile_gui/airootfs/usr/share/applications/Hardware Information.desktop
diff --git a/setup/linux/include_x/airootfs/usr/share/applications/NetworkTest.desktop b/setup/linux/profile_gui/airootfs/usr/share/applications/NetworkTest.desktop
similarity index 100%
rename from setup/linux/include_x/airootfs/usr/share/applications/NetworkTest.desktop
rename to setup/linux/profile_gui/airootfs/usr/share/applications/NetworkTest.desktop