diff --git a/Mods/People/Sarah/HR_supervisor_progression_scene.rpy b/Mods/Roles/Business/HR_supervisor/HR_supervisor_progression_scene.rpy
similarity index 100%
rename from Mods/People/Sarah/HR_supervisor_progression_scene.rpy
rename to Mods/Roles/Business/HR_supervisor/HR_supervisor_progression_scene.rpy
diff --git a/Mods/People/Sarah/role_HR_supervisor.rpy b/Mods/Roles/Business/HR_supervisor/HR_supervisor_role.rpy
similarity index 100%
rename from Mods/People/Sarah/role_HR_supervisor.rpy
rename to Mods/Roles/Business/HR_supervisor/HR_supervisor_role.rpy
diff --git a/Mods/People/Ellie/IT_Business_Projects.rpy b/Mods/Roles/Business/IT_Director/IT_Business_Projects.rpy
similarity index 100%
rename from Mods/People/Ellie/IT_Business_Projects.rpy
rename to Mods/Roles/Business/IT_Director/IT_Business_Projects.rpy
diff --git a/Mods/People/Ellie/IT_Nanobot_Projects.rpy b/Mods/Roles/Business/IT_Director/IT_Nanobot_Projects.rpy
similarity index 100%
rename from Mods/People/Ellie/IT_Nanobot_Projects.rpy
rename to Mods/Roles/Business/IT_Director/IT_Nanobot_Projects.rpy
diff --git a/Mods/People/Ellie/IT_Project_Screen.rpy b/Mods/Roles/Business/IT_Director/IT_Project_Screen.rpy
similarity index 100%
rename from Mods/People/Ellie/IT_Project_Screen.rpy
rename to Mods/Roles/Business/IT_Director/IT_Project_Screen.rpy
diff --git a/Mods/People/Ellie/IT_Project_class.rpy b/Mods/Roles/Business/IT_Director/IT_Project_class.rpy
similarity index 100%
rename from Mods/People/Ellie/IT_Project_class.rpy
rename to Mods/Roles/Business/IT_Director/IT_Project_class.rpy
diff --git a/Mods/People/Ellie/IT_Work.rpy b/Mods/Roles/Business/IT_Director/IT_Work.rpy
similarity index 100%
rename from Mods/People/Ellie/IT_Work.rpy
rename to Mods/Roles/Business/IT_Director/IT_Work.rpy
diff --git a/Mods/People/Ellie/role_IT_director.rpy b/Mods/Roles/Business/IT_director/IT_director_role.rpy
similarity index 100%
rename from Mods/People/Ellie/role_IT_director.rpy
rename to Mods/Roles/Business/IT_director/IT_director_role.rpy
diff --git a/Mods/People/Kaya/college_intern_role.rpy b/Mods/Roles/Business/college_intern_role.rpy
similarity index 100%
rename from Mods/People/Kaya/college_intern_role.rpy
rename to Mods/Roles/Business/college_intern_role.rpy
diff --git a/Mods/People/Ashley/MC_Serum_Screen.rpy b/Mods/Roles/Business/production_assistant/MC_Serum_Screen.rpy
similarity index 100%
rename from Mods/People/Ashley/MC_Serum_Screen.rpy
rename to Mods/Roles/Business/production_assistant/MC_Serum_Screen.rpy
diff --git a/Mods/People/Ashley/MC_Serums.rpy b/Mods/Roles/Business/production_assistant/MC_Serums.rpy
similarity index 100%
rename from Mods/People/Ashley/MC_Serums.rpy
rename to Mods/Roles/Business/production_assistant/MC_Serums.rpy
diff --git a/Mods/People/Ashley/role_production_assistant.rpy b/Mods/Roles/Business/production_assistant/production_assistant_role.rpy
similarity index 100%
rename from Mods/People/Ashley/role_production_assistant.rpy
rename to Mods/Roles/Business/production_assistant/production_assistant_role.rpy
diff --git a/Mods/Role/Enhanced/employee_role_enhanced.rpy b/Mods/Roles/Enhanced/employee_role_enhanced.rpy
similarity index 100%
rename from Mods/Role/Enhanced/employee_role_enhanced.rpy
rename to Mods/Roles/Enhanced/employee_role_enhanced.rpy
diff --git a/Mods/Role/Enhanced/girlfriend_role_enhanced.rpy b/Mods/Roles/Enhanced/girlfriend_role_enhanced.rpy
similarity index 99%
rename from Mods/Role/Enhanced/girlfriend_role_enhanced.rpy
rename to Mods/Roles/Enhanced/girlfriend_role_enhanced.rpy
index f976a59f9e95a4111f3b76e06197223fecee8060..3b2db7ea0f8121971f8e797f1068f6b56f020c6e 100644
--- a/Mods/Role/Enhanced/girlfriend_role_enhanced.rpy
+++ b/Mods/Roles/Enhanced/girlfriend_role_enhanced.rpy
@@ -1,7 +1,7 @@
 #This file is to add new options to girlfriends. Ideas include: afternoon delight, my place / your place, sexting, clothes shopping.
 #Roleplays: These are scenes that will involve your girlfriend pretending to be someone/something else. Designed to take the place of the initial fucking scene.
 
-init 2 python:
+init 3 python:
     girlfriend_morning_action_list = []     #Requirement functions can check mc.location to tell if it's myplace/yourplace if necessary.
     girlfriend_sleepover_interruption_list = []     #Ideas, daughter/mother walk in, phone call,
     girlfriend_roleplay_list = []           #When a roleplay is created, add it here as an option. list of ACTIONS
diff --git a/Mods/Role/Enhanced/role_aunt_enhanced.rpy b/Mods/Roles/Enhanced/role_aunt_enhanced.rpy
similarity index 100%
rename from Mods/Role/Enhanced/role_aunt_enhanced.rpy
rename to Mods/Roles/Enhanced/role_aunt_enhanced.rpy
diff --git a/Mods/Role/Enhanced/role_mother_enhanced.rpy b/Mods/Roles/Enhanced/role_mother_enhanced.rpy
similarity index 100%
rename from Mods/Role/Enhanced/role_mother_enhanced.rpy
rename to Mods/Roles/Enhanced/role_mother_enhanced.rpy
diff --git a/Mods/Role/Enhanced/role_nora_enhanced.rpy b/Mods/Roles/Enhanced/role_nora_enhanced.rpy
similarity index 100%
rename from Mods/Role/Enhanced/role_nora_enhanced.rpy
rename to Mods/Roles/Enhanced/role_nora_enhanced.rpy
diff --git a/Mods/Role/Enhanced/role_sister_enhanced.back b/Mods/Roles/Enhanced/role_sister_enhanced.back
similarity index 100%
rename from Mods/Role/Enhanced/role_sister_enhanced.back
rename to Mods/Roles/Enhanced/role_sister_enhanced.back
diff --git a/Mods/Role/Enhanced/role_student_mom_enhanced.rpy b/Mods/Roles/Enhanced/role_student_mom_enhanced.rpy
similarity index 100%
rename from Mods/Role/Enhanced/role_student_mom_enhanced.rpy
rename to Mods/Roles/Enhanced/role_student_mom_enhanced.rpy
diff --git a/Mods/Plotlines/StripClub/Role/stripclub_bdsm_performer_role.rpy b/Mods/Roles/StripClub/stripclub_bdsm_performer_role.rpy
similarity index 100%
rename from Mods/Plotlines/StripClub/Role/stripclub_bdsm_performer_role.rpy
rename to Mods/Roles/StripClub/stripclub_bdsm_performer_role.rpy
diff --git a/Mods/Plotlines/StripClub/Role/stripclub_manager_role.rpy b/Mods/Roles/StripClub/stripclub_manager_role.rpy
similarity index 100%
rename from Mods/Plotlines/StripClub/Role/stripclub_manager_role.rpy
rename to Mods/Roles/StripClub/stripclub_manager_role.rpy
diff --git a/Mods/Plotlines/StripClub/Role/stripclub_stripper_role.rpy b/Mods/Roles/StripClub/stripclub_stripper_role.rpy
similarity index 100%
rename from Mods/Plotlines/StripClub/Role/stripclub_stripper_role.rpy
rename to Mods/Roles/StripClub/stripclub_stripper_role.rpy
diff --git a/Mods/Plotlines/StripClub/Role/stripclub_waitress_role.rpy b/Mods/Roles/StripClub/stripclub_waitress_role.rpy
similarity index 100%
rename from Mods/Plotlines/StripClub/Role/stripclub_waitress_role.rpy
rename to Mods/Roles/StripClub/stripclub_waitress_role.rpy
diff --git a/Mods/Role/clone_role.rpy b/Mods/Roles/clone_role.rpy
similarity index 100%
rename from Mods/Role/clone_role.rpy
rename to Mods/Roles/clone_role.rpy
diff --git a/Mods/Role/role_harem.rpy b/Mods/Roles/harem_role.rpy
similarity index 100%
rename from Mods/Role/role_harem.rpy
rename to Mods/Roles/harem_role.rpy
diff --git a/Mods/People/Ashley/role_jealous_sister.rpy b/Mods/Roles/jealous_sister_role.rpy
similarity index 100%
rename from Mods/People/Ashley/role_jealous_sister.rpy
rename to Mods/Roles/jealous_sister_role.rpy
diff --git a/Mods/Role/maid_role.rpy b/Mods/Roles/maid_role.rpy
similarity index 100%
rename from Mods/Role/maid_role.rpy
rename to Mods/Roles/maid_role.rpy
diff --git a/Mods/People/Starbuck/Sex_Shop_Owner_Role.rpy b/Mods/Roles/sex_shop_owner_role.rpy
similarity index 100%
rename from Mods/People/Starbuck/Sex_Shop_Owner_Role.rpy
rename to Mods/Roles/sex_shop_owner_role.rpy
diff --git a/Mods/Role/slave_role.rpy b/Mods/Roles/slave_role.rpy
similarity index 100%
rename from Mods/Role/slave_role.rpy
rename to Mods/Roles/slave_role.rpy
diff --git a/Mods/Role/suggestable_role.rpy b/Mods/Roles/suggestable_role.rpy
similarity index 100%
rename from Mods/Role/suggestable_role.rpy
rename to Mods/Roles/suggestable_role.rpy