diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessElement.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessElement.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessElement.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessElement.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessElement.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessList.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessList.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessList.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessList.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlAccessList.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingElement.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingElement.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingElement.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingElement.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingElement.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingList.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingList.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingList.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingList.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlEnviromentSettingList.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleElement.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleElement.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleElement.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleElement.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleElement.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleList.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleList.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleList.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleList.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleList.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleUserList.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleUserList.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleUserList.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleUserList.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleUserList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleUserList.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleUserList.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleUserList.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleUserList.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleUserList.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlRoleUserList.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleUserList.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserElement.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserElement.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserElement.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserElement.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserElement.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserList.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserList.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserList.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserList.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserList.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleList.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserRoleList.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleList.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserRoleList.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserRoleList.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleList.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserRoleList.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleList.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserRoleList.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleList.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserRoleList.resx
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleElement.Designer.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.Designer.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleElement.Designer.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.Designer.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleElement.cs
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs
diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleElement.resx b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.resx
similarity index 100%
rename from DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/ControlUserRoleElement.resx
rename to DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.resx