diff --git a/.root_items/Drivers/Extras/AMD.url b/.kit_items/Drivers/Extras/AMD.url
similarity index 100%
rename from .root_items/Drivers/Extras/AMD.url
rename to .kit_items/Drivers/Extras/AMD.url
diff --git a/.root_items/Drivers/Extras/Dell (FTP - Browse for Drivers).url b/.kit_items/Drivers/Extras/Dell (FTP - Browse for Drivers).url
similarity index 100%
rename from .root_items/Drivers/Extras/Dell (FTP - Browse for Drivers).url
rename to .kit_items/Drivers/Extras/Dell (FTP - Browse for Drivers).url
diff --git a/.root_items/Drivers/Extras/Dell (Simplified Interface).url b/.kit_items/Drivers/Extras/Dell (Simplified Interface).url
similarity index 100%
rename from .root_items/Drivers/Extras/Dell (Simplified Interface).url
rename to .kit_items/Drivers/Extras/Dell (Simplified Interface).url
diff --git a/.root_items/Drivers/Extras/Dell (Support Site).url b/.kit_items/Drivers/Extras/Dell (Support Site).url
similarity index 100%
rename from .root_items/Drivers/Extras/Dell (Support Site).url
rename to .kit_items/Drivers/Extras/Dell (Support Site).url
diff --git a/.root_items/Drivers/Extras/Device Remover.url b/.kit_items/Drivers/Extras/Device Remover.url
similarity index 100%
rename from .root_items/Drivers/Extras/Device Remover.url
rename to .kit_items/Drivers/Extras/Device Remover.url
diff --git a/.root_items/Drivers/Extras/Display Driver Uninstaller.url b/.kit_items/Drivers/Extras/Display Driver Uninstaller.url
similarity index 100%
rename from .root_items/Drivers/Extras/Display Driver Uninstaller.url
rename to .kit_items/Drivers/Extras/Display Driver Uninstaller.url
diff --git a/.root_items/Drivers/Extras/HP.url b/.kit_items/Drivers/Extras/HP.url
similarity index 100%
rename from .root_items/Drivers/Extras/HP.url
rename to .kit_items/Drivers/Extras/HP.url
diff --git a/.root_items/Drivers/Extras/Intel Driver & Support Assistant.url b/.kit_items/Drivers/Extras/Intel Driver & Support Assistant.url
similarity index 100%
rename from .root_items/Drivers/Extras/Intel Driver & Support Assistant.url
rename to .kit_items/Drivers/Extras/Intel Driver & Support Assistant.url
diff --git a/.root_items/Drivers/Extras/NVIDIA.url b/.kit_items/Drivers/Extras/NVIDIA.url
similarity index 100%
rename from .root_items/Drivers/Extras/NVIDIA.url
rename to .kit_items/Drivers/Extras/NVIDIA.url
diff --git a/.root_items/Drivers/Extras/Samsung Tools & Software.url b/.kit_items/Drivers/Extras/Samsung Tools & Software.url
similarity index 100%
rename from .root_items/Drivers/Extras/Samsung Tools & Software.url
rename to .kit_items/Drivers/Extras/Samsung Tools & Software.url
diff --git a/.root_items/Installers/BackBlaze.url b/.kit_items/Installers/BackBlaze.url
similarity index 100%
rename from .root_items/Installers/BackBlaze.url
rename to .kit_items/Installers/BackBlaze.url
diff --git a/.root_items/Misc/Fix Missing Optical Drive.reg b/.kit_items/Misc/Fix Missing Optical Drive.reg
similarity index 100%
rename from .root_items/Misc/Fix Missing Optical Drive.reg
rename to .kit_items/Misc/Fix Missing Optical Drive.reg
diff --git a/.root_items/Misc/Nirsoft Utilities - Outlook.url b/.kit_items/Misc/Nirsoft Utilities - Outlook.url
similarity index 100%
rename from .root_items/Misc/Nirsoft Utilities - Outlook.url
rename to .kit_items/Misc/Nirsoft Utilities - Outlook.url
diff --git a/.root_items/Misc/Nirsoft Utilities - Passwords.url b/.kit_items/Misc/Nirsoft Utilities - Passwords.url
similarity index 100%
rename from .root_items/Misc/Nirsoft Utilities - Passwords.url
rename to .kit_items/Misc/Nirsoft Utilities - Passwords.url
diff --git a/.root_items/Misc/Sysinternals Suite (Live).url b/.kit_items/Misc/Sysinternals Suite (Live).url
similarity index 100%
rename from .root_items/Misc/Sysinternals Suite (Live).url
rename to .kit_items/Misc/Sysinternals Suite (Live).url
diff --git a/.root_items/Uninstallers/AV Removal Tools/AV Removal Tools.url b/.kit_items/Uninstallers/AV Removal Tools/AV Removal Tools.url
similarity index 100%
rename from .root_items/Uninstallers/AV Removal Tools/AV Removal Tools.url
rename to .kit_items/Uninstallers/AV Removal Tools/AV Removal Tools.url
diff --git a/.root_items/Uninstallers/AV Removal Tools/AVG.url b/.kit_items/Uninstallers/AV Removal Tools/AVG.url
similarity index 100%
rename from .root_items/Uninstallers/AV Removal Tools/AVG.url
rename to .kit_items/Uninstallers/AV Removal Tools/AVG.url
diff --git a/.root_items/Uninstallers/AV Removal Tools/Avast.url b/.kit_items/Uninstallers/AV Removal Tools/Avast.url
similarity index 100%
rename from .root_items/Uninstallers/AV Removal Tools/Avast.url
rename to .kit_items/Uninstallers/AV Removal Tools/Avast.url
diff --git a/.root_items/Uninstallers/AV Removal Tools/Avira.url b/.kit_items/Uninstallers/AV Removal Tools/Avira.url
similarity index 100%
rename from .root_items/Uninstallers/AV Removal Tools/Avira.url
rename to .kit_items/Uninstallers/AV Removal Tools/Avira.url
diff --git a/.root_items/Uninstallers/AV Removal Tools/ESET.url b/.kit_items/Uninstallers/AV Removal Tools/ESET.url
similarity index 100%
rename from .root_items/Uninstallers/AV Removal Tools/ESET.url
rename to .kit_items/Uninstallers/AV Removal Tools/ESET.url
diff --git a/.root_items/Uninstallers/AV Removal Tools/Kaspersky.url b/.kit_items/Uninstallers/AV Removal Tools/Kaspersky.url
similarity index 100%
rename from .root_items/Uninstallers/AV Removal Tools/Kaspersky.url
rename to .kit_items/Uninstallers/AV Removal Tools/Kaspersky.url
diff --git a/.root_items/Uninstallers/AV Removal Tools/MBAM.url b/.kit_items/Uninstallers/AV Removal Tools/MBAM.url
similarity index 100%
rename from .root_items/Uninstallers/AV Removal Tools/MBAM.url
rename to .kit_items/Uninstallers/AV Removal Tools/MBAM.url
diff --git a/.root_items/Uninstallers/AV Removal Tools/McAfee.url b/.kit_items/Uninstallers/AV Removal Tools/McAfee.url
similarity index 100%
rename from .root_items/Uninstallers/AV Removal Tools/McAfee.url
rename to .kit_items/Uninstallers/AV Removal Tools/McAfee.url
diff --git a/.root_items/Uninstallers/AV Removal Tools/Norton.url b/.kit_items/Uninstallers/AV Removal Tools/Norton.url
similarity index 100%
rename from .root_items/Uninstallers/AV Removal Tools/Norton.url
rename to .kit_items/Uninstallers/AV Removal Tools/Norton.url
diff --git a/Build Kit.cmd b/Build Kit.cmd
index 36d1691a..7b5d1491 100644
--- a/Build Kit.cmd	
+++ b/Build Kit.cmd	
@@ -13,9 +13,9 @@ if not exist ".bin\Scripts\build_kit.ps1" (goto ErrorBuildKitMissing)
 
 :PrepNewKit
 rem Copy base files to a new folder OUT\%KIT_NAME_FULL%
-robocopy /e . OUT /xd .git .root_items OUT /xf .gitignore "Build Kit.cmd" ConEmu.png
-robocopy /e .root_items OUT
-copy ConEmu.png OUT\.bin\ConEmu\
+robocopy /e . OUT /xd .git .kit_items OUT /xf .gitignore "Build Kit.cmd"
+robocopy /e .kit_items OUT
+copy Images\ConEmu.png OUT\.bin\ConEmu\
 mkdir OUT\.cbin >nul 2>&1
 attrib +h OUT\.bin >nul 2>&1
 attrib +h OUT\.cbin >nul 2>&1
diff --git a/ConEmu.png b/Images/ConEmu.png
similarity index 100%
rename from ConEmu.png
rename to Images/ConEmu.png