diff --git a/Individual Components/Keypad.rbxm b/Individual Components/Base Parts/Keypad.rbxm
similarity index 100%
rename from Individual Components/Keypad.rbxm
rename to Individual Components/Base Parts/Keypad.rbxm
diff --git a/Individual Components/SystemTemplate.rbxm b/Individual Components/Base Parts/SystemTemplate.rbxm
similarity index 100%
rename from Individual Components/SystemTemplate.rbxm
rename to Individual Components/Base Parts/SystemTemplate.rbxm
diff --git a/Individual Components/WorkingDialerModel.rbxm b/Individual Components/Dialers/PhoneDialer.rbxm
similarity index 100%
rename from Individual Components/WorkingDialerModel.rbxm
rename to Individual Components/Dialers/PhoneDialer.rbxm
diff --git a/Individual Components/Dialers/WebhookDialer.rbxm b/Individual Components/Dialers/WebhookDialer.rbxm
new file mode 100644
index 0000000..edb49a2
Binary files /dev/null and b/Individual Components/Dialers/WebhookDialer.rbxm differ
diff --git a/Individual Components/SecuritySystemMainScript.rbxm b/Individual Components/SecuritySystemMainScript.rbxm
deleted file mode 100644
index 94023d2..0000000
Binary files a/Individual Components/SecuritySystemMainScript.rbxm and /dev/null differ
diff --git a/Individual Components/IndoorSiren.rbxm b/Individual Components/Sirens/IndoorSiren.rbxm
similarity index 100%
rename from Individual Components/IndoorSiren.rbxm
rename to Individual Components/Sirens/IndoorSiren.rbxm
diff --git a/Individual Components/RFS NAC Converter.rbxm b/Individual Components/Sirens/RFS NAC Converter.rbxm
similarity index 100%
rename from Individual Components/RFS NAC Converter.rbxm
rename to Individual Components/Sirens/RFS NAC Converter.rbxm
diff --git a/Individual Components/VoiceSirenDriver.rbxm b/Individual Components/Sirens/VoiceSirenDriver.rbxm
similarity index 100%
rename from Individual Components/VoiceSirenDriver.rbxm
rename to Individual Components/Sirens/VoiceSirenDriver.rbxm
diff --git a/Individual Components/DoorContacts.rbxm b/Individual Components/Zone Stuff/DoorContacts.rbxm
similarity index 100%
rename from Individual Components/DoorContacts.rbxm
rename to Individual Components/Zone Stuff/DoorContacts.rbxm
diff --git a/Individual Components/FunctionKey.rbxm b/Individual Components/Zone Stuff/FunctionKey.rbxm
similarity index 100%
rename from Individual Components/FunctionKey.rbxm
rename to Individual Components/Zone Stuff/FunctionKey.rbxm
diff --git a/Individual Components/MotionDetector.rbxm b/Individual Components/Zone Stuff/MotionDetector.rbxm
similarity index 100%
rename from Individual Components/MotionDetector.rbxm
rename to Individual Components/Zone Stuff/MotionDetector.rbxm
diff --git a/Individual Components/ZoneTemplate.rbxm b/Individual Components/Zone Stuff/ZoneTemplate.rbxm
similarity index 100%
rename from Individual Components/ZoneTemplate.rbxm
rename to Individual Components/Zone Stuff/ZoneTemplate.rbxm