diff --git a/ldap_departments_sync/CHANGELOG.md b/modules/ldap_departments_sync/CHANGELOG.md
similarity index 100%
rename from ldap_departments_sync/CHANGELOG.md
rename to modules/ldap_departments_sync/CHANGELOG.md
diff --git a/ldap_departments_sync/README.md b/modules/ldap_departments_sync/README.md
similarity index 100%
rename from ldap_departments_sync/README.md
rename to modules/ldap_departments_sync/README.md
diff --git a/ldap_departments_sync/config/optional/core.entity_form_display.group.departments.default.yml b/modules/ldap_departments_sync/config/optional/core.entity_form_display.group.departments.default.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/core.entity_form_display.group.departments.default.yml
rename to modules/ldap_departments_sync/config/optional/core.entity_form_display.group.departments.default.yml
diff --git a/ldap_departments_sync/config/optional/core.entity_view_display.group.departments.default.yml b/modules/ldap_departments_sync/config/optional/core.entity_view_display.group.departments.default.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/core.entity_view_display.group.departments.default.yml
rename to modules/ldap_departments_sync/config/optional/core.entity_view_display.group.departments.default.yml
diff --git a/ldap_departments_sync/config/optional/core.entity_view_display.user.user.default.yml b/modules/ldap_departments_sync/config/optional/core.entity_view_display.user.user.default.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/core.entity_view_display.user.user.default.yml
rename to modules/ldap_departments_sync/config/optional/core.entity_view_display.user.user.default.yml
diff --git a/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_acronym.yml b/modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_acronym.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.group.departments.field_dept_acronym.yml
rename to modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_acronym.yml
diff --git a/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_code.yml b/modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_code.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.group.departments.field_dept_code.yml
rename to modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_code.yml
diff --git a/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_coord.yml b/modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_coord.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.group.departments.field_dept_coord.yml
rename to modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_coord.yml
diff --git a/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_coord_assoc.yml b/modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_coord_assoc.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.group.departments.field_dept_coord_assoc.yml
rename to modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_coord_assoc.yml
diff --git a/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_mail.yml b/modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_mail.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.group.departments.field_dept_mail.yml
rename to modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_mail.yml
diff --git a/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_phone.yml b/modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_phone.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.group.departments.field_dept_phone.yml
rename to modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_phone.yml
diff --git a/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_room.yml b/modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_room.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.group.departments.field_dept_room.yml
rename to modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_room.yml
diff --git a/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_type.yml b/modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_type.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.group.departments.field_dept_type.yml
rename to modules/ldap_departments_sync/config/optional/field.field.group.departments.field_dept_type.yml
diff --git a/ldap_departments_sync/config/optional/field.field.group.departments.field_parent_group.yml b/modules/ldap_departments_sync/config/optional/field.field.group.departments.field_parent_group.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.group.departments.field_parent_group.yml
rename to modules/ldap_departments_sync/config/optional/field.field.group.departments.field_parent_group.yml
diff --git a/ldap_departments_sync/config/optional/field.field.user.user.field_user_category.yml b/modules/ldap_departments_sync/config/optional/field.field.user.user.field_user_category.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.user.user.field_user_category.yml
rename to modules/ldap_departments_sync/config/optional/field.field.user.user.field_user_category.yml
diff --git a/ldap_departments_sync/config/optional/field.field.user.user.field_user_department.yml b/modules/ldap_departments_sync/config/optional/field.field.user.user.field_user_department.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.user.user.field_user_department.yml
rename to modules/ldap_departments_sync/config/optional/field.field.user.user.field_user_department.yml
diff --git a/ldap_departments_sync/config/optional/field.field.user.user.field_user_dept_code.yml b/modules/ldap_departments_sync/config/optional/field.field.user.user.field_user_dept_code.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.user.user.field_user_dept_code.yml
rename to modules/ldap_departments_sync/config/optional/field.field.user.user.field_user_dept_code.yml
diff --git a/ldap_departments_sync/config/optional/field.field.user.user.field_user_work_phone.yml b/modules/ldap_departments_sync/config/optional/field.field.user.user.field_user_work_phone.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.field.user.user.field_user_work_phone.yml
rename to modules/ldap_departments_sync/config/optional/field.field.user.user.field_user_work_phone.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.group.field_dept_acronym.yml b/modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_acronym.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.group.field_dept_acronym.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_acronym.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.group.field_dept_code.yml b/modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_code.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.group.field_dept_code.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_code.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.group.field_dept_coord.yml b/modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_coord.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.group.field_dept_coord.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_coord.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.group.field_dept_coord_assoc.yml b/modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_coord_assoc.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.group.field_dept_coord_assoc.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_coord_assoc.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.group.field_dept_mail.yml b/modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_mail.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.group.field_dept_mail.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_mail.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.group.field_dept_phone.yml b/modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_phone.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.group.field_dept_phone.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_phone.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.group.field_dept_room.yml b/modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_room.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.group.field_dept_room.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_room.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.group.field_dept_type.yml b/modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_type.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.group.field_dept_type.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.group.field_dept_type.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.group.field_parent_group.yml b/modules/ldap_departments_sync/config/optional/field.storage.group.field_parent_group.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.group.field_parent_group.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.group.field_parent_group.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.user.field_user_category.yml b/modules/ldap_departments_sync/config/optional/field.storage.user.field_user_category.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.user.field_user_category.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.user.field_user_category.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.user.field_user_department.yml b/modules/ldap_departments_sync/config/optional/field.storage.user.field_user_department.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.user.field_user_department.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.user.field_user_department.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.user.field_user_dept_code.yml b/modules/ldap_departments_sync/config/optional/field.storage.user.field_user_dept_code.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.user.field_user_dept_code.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.user.field_user_dept_code.yml
diff --git a/ldap_departments_sync/config/optional/field.storage.user.field_user_work_phone.yml b/modules/ldap_departments_sync/config/optional/field.storage.user.field_user_work_phone.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/field.storage.user.field_user_work_phone.yml
rename to modules/ldap_departments_sync/config/optional/field.storage.user.field_user_work_phone.yml
diff --git a/ldap_departments_sync/config/optional/group.role.departments-admin.yml b/modules/ldap_departments_sync/config/optional/group.role.departments-admin.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/group.role.departments-admin.yml
rename to modules/ldap_departments_sync/config/optional/group.role.departments-admin.yml
diff --git a/ldap_departments_sync/config/optional/group.role.departments-admin_in.yml b/modules/ldap_departments_sync/config/optional/group.role.departments-admin_in.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/group.role.departments-admin_in.yml
rename to modules/ldap_departments_sync/config/optional/group.role.departments-admin_in.yml
diff --git a/ldap_departments_sync/config/optional/group.role.departments-admin_out.yml b/modules/ldap_departments_sync/config/optional/group.role.departments-admin_out.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/group.role.departments-admin_out.yml
rename to modules/ldap_departments_sync/config/optional/group.role.departments-admin_out.yml
diff --git a/ldap_departments_sync/config/optional/group.role.departments-anonymous.yml b/modules/ldap_departments_sync/config/optional/group.role.departments-anonymous.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/group.role.departments-anonymous.yml
rename to modules/ldap_departments_sync/config/optional/group.role.departments-anonymous.yml
diff --git a/ldap_departments_sync/config/optional/group.role.departments-member.yml b/modules/ldap_departments_sync/config/optional/group.role.departments-member.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/group.role.departments-member.yml
rename to modules/ldap_departments_sync/config/optional/group.role.departments-member.yml
diff --git a/ldap_departments_sync/config/optional/group.role.departments-outsider.yml b/modules/ldap_departments_sync/config/optional/group.role.departments-outsider.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/group.role.departments-outsider.yml
rename to modules/ldap_departments_sync/config/optional/group.role.departments-outsider.yml
diff --git a/ldap_departments_sync/config/optional/group.type.departments.yml b/modules/ldap_departments_sync/config/optional/group.type.departments.yml
similarity index 100%
rename from ldap_departments_sync/config/optional/group.type.departments.yml
rename to modules/ldap_departments_sync/config/optional/group.type.departments.yml
diff --git a/ldap_departments_sync/config/translations/pt-br/field.field.user.user.field_user_work_phone.yml b/modules/ldap_departments_sync/config/translations/pt-br/field.field.user.user.field_user_work_phone.yml
similarity index 100%
rename from ldap_departments_sync/config/translations/pt-br/field.field.user.user.field_user_work_phone.yml
rename to modules/ldap_departments_sync/config/translations/pt-br/field.field.user.user.field_user_work_phone.yml
diff --git a/ldap_departments_sync/css/role-mapping.css b/modules/ldap_departments_sync/css/role-mapping.css
similarity index 100%
rename from ldap_departments_sync/css/role-mapping.css
rename to modules/ldap_departments_sync/css/role-mapping.css
diff --git a/ldap_departments_sync/ldap_departments_sync.info.yml b/modules/ldap_departments_sync/ldap_departments_sync.info.yml
similarity index 100%
rename from ldap_departments_sync/ldap_departments_sync.info.yml
rename to modules/ldap_departments_sync/ldap_departments_sync.info.yml
diff --git a/ldap_departments_sync/ldap_departments_sync.install b/modules/ldap_departments_sync/ldap_departments_sync.install
similarity index 100%
rename from ldap_departments_sync/ldap_departments_sync.install
rename to modules/ldap_departments_sync/ldap_departments_sync.install
diff --git a/ldap_departments_sync/ldap_departments_sync.libraries.yml b/modules/ldap_departments_sync/ldap_departments_sync.libraries.yml
similarity index 100%
rename from ldap_departments_sync/ldap_departments_sync.libraries.yml
rename to modules/ldap_departments_sync/ldap_departments_sync.libraries.yml
diff --git a/ldap_departments_sync/ldap_departments_sync.links.menu.yml b/modules/ldap_departments_sync/ldap_departments_sync.links.menu.yml
similarity index 100%
rename from ldap_departments_sync/ldap_departments_sync.links.menu.yml
rename to modules/ldap_departments_sync/ldap_departments_sync.links.menu.yml
diff --git a/ldap_departments_sync/ldap_departments_sync.links.task.yml b/modules/ldap_departments_sync/ldap_departments_sync.links.task.yml
similarity index 100%
rename from ldap_departments_sync/ldap_departments_sync.links.task.yml
rename to modules/ldap_departments_sync/ldap_departments_sync.links.task.yml
diff --git a/ldap_departments_sync/ldap_departments_sync.module b/modules/ldap_departments_sync/ldap_departments_sync.module
similarity index 100%
rename from ldap_departments_sync/ldap_departments_sync.module
rename to modules/ldap_departments_sync/ldap_departments_sync.module
diff --git a/ldap_departments_sync/ldap_departments_sync.permissions.yml b/modules/ldap_departments_sync/ldap_departments_sync.permissions.yml
similarity index 100%
rename from ldap_departments_sync/ldap_departments_sync.permissions.yml
rename to modules/ldap_departments_sync/ldap_departments_sync.permissions.yml
diff --git a/ldap_departments_sync/ldap_departments_sync.routing.yml b/modules/ldap_departments_sync/ldap_departments_sync.routing.yml
similarity index 100%
rename from ldap_departments_sync/ldap_departments_sync.routing.yml
rename to modules/ldap_departments_sync/ldap_departments_sync.routing.yml
diff --git a/ldap_departments_sync/ldap_departments_sync.services.yml b/modules/ldap_departments_sync/ldap_departments_sync.services.yml
similarity index 100%
rename from ldap_departments_sync/ldap_departments_sync.services.yml
rename to modules/ldap_departments_sync/ldap_departments_sync.services.yml
diff --git a/ldap_departments_sync/src/Controller/LocalModulesController.php b/modules/ldap_departments_sync/src/Controller/LocalModulesController.php
similarity index 100%
rename from ldap_departments_sync/src/Controller/LocalModulesController.php
rename to modules/ldap_departments_sync/src/Controller/LocalModulesController.php
diff --git a/ldap_departments_sync/src/Form/AccessRuleForm.php b/modules/ldap_departments_sync/src/Form/AccessRuleForm.php
similarity index 100%
rename from ldap_departments_sync/src/Form/AccessRuleForm.php
rename to modules/ldap_departments_sync/src/Form/AccessRuleForm.php
diff --git a/ldap_departments_sync/src/Form/AccessRulesForm.php b/modules/ldap_departments_sync/src/Form/AccessRulesForm.php
similarity index 100%
rename from ldap_departments_sync/src/Form/AccessRulesForm.php
rename to modules/ldap_departments_sync/src/Form/AccessRulesForm.php
diff --git a/ldap_departments_sync/src/Form/LdapDepartmentsSyncConfigForm.php b/modules/ldap_departments_sync/src/Form/LdapDepartmentsSyncConfigForm.php
similarity index 100%
rename from ldap_departments_sync/src/Form/LdapDepartmentsSyncConfigForm.php
rename to modules/ldap_departments_sync/src/Form/LdapDepartmentsSyncConfigForm.php
diff --git a/ldap_departments_sync/src/LdapDepartmentsSync.php b/modules/ldap_departments_sync/src/LdapDepartmentsSync.php
similarity index 100%
rename from ldap_departments_sync/src/LdapDepartmentsSync.php
rename to modules/ldap_departments_sync/src/LdapDepartmentsSync.php
diff --git a/ldap_departments_sync/src/Plugin/EntityReferenceSelection/DepartmentSelection.php b/modules/ldap_departments_sync/src/Plugin/EntityReferenceSelection/DepartmentSelection.php
similarity index 100%
rename from ldap_departments_sync/src/Plugin/EntityReferenceSelection/DepartmentSelection.php
rename to modules/ldap_departments_sync/src/Plugin/EntityReferenceSelection/DepartmentSelection.php
diff --git a/ldap_departments_sync/translations/ldap_departments_sync.pt-br.po b/modules/ldap_departments_sync/translations/ldap_departments_sync.pt-br.po
similarity index 100%
rename from ldap_departments_sync/translations/ldap_departments_sync.pt-br.po
rename to modules/ldap_departments_sync/translations/ldap_departments_sync.pt-br.po
diff --git a/ldap_departments_sync/translations/pt-br.po b/modules/ldap_departments_sync/translations/pt-br.po
similarity index 100%
rename from ldap_departments_sync/translations/pt-br.po
rename to modules/ldap_departments_sync/translations/pt-br.po
diff --git a/ldap_research_groups_sync/README.md b/modules/ldap_research_groups_sync/README.md
similarity index 100%
rename from ldap_research_groups_sync/README.md
rename to modules/ldap_research_groups_sync/README.md
diff --git a/ldap_research_groups_sync/config/optional/core.entity_form_display.group.research_group.default.yml b/modules/ldap_research_groups_sync/config/optional/core.entity_form_display.group.research_group.default.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/core.entity_form_display.group.research_group.default.yml
rename to modules/ldap_research_groups_sync/config/optional/core.entity_form_display.group.research_group.default.yml
diff --git a/ldap_research_groups_sync/config/optional/core.entity_view_display.group.research_group.default.yml b/modules/ldap_research_groups_sync/config/optional/core.entity_view_display.group.research_group.default.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/core.entity_view_display.group.research_group.default.yml
rename to modules/ldap_research_groups_sync/config/optional/core.entity_view_display.group.research_group.default.yml
diff --git a/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_code.yml b/modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_code.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_code.yml
rename to modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_code.yml
diff --git a/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_coord.yml b/modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_coord.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_coord.yml
rename to modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_coord.yml
diff --git a/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_coord_assoc.yml b/modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_coord_assoc.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_coord_assoc.yml
rename to modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_coord_assoc.yml
diff --git a/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_department.yml b/modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_department.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_department.yml
rename to modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_department.yml
diff --git a/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_mail.yml b/modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_mail.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_mail.yml
rename to modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_mail.yml
diff --git a/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_phone.yml b/modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_phone.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_phone.yml
rename to modules/ldap_research_groups_sync/config/optional/field.field.group.research_group.field_rg_phone.yml
diff --git a/ldap_research_groups_sync/config/optional/field.field.user.user.field_user_research_groups.yml b/modules/ldap_research_groups_sync/config/optional/field.field.user.user.field_user_research_groups.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.field.user.user.field_user_research_groups.yml
rename to modules/ldap_research_groups_sync/config/optional/field.field.user.user.field_user_research_groups.yml
diff --git a/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_code.yml b/modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_code.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.storage.group.field_rg_code.yml
rename to modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_code.yml
diff --git a/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_coord.yml b/modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_coord.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.storage.group.field_rg_coord.yml
rename to modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_coord.yml
diff --git a/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_coord_assoc.yml b/modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_coord_assoc.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.storage.group.field_rg_coord_assoc.yml
rename to modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_coord_assoc.yml
diff --git a/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_department.yml b/modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_department.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.storage.group.field_rg_department.yml
rename to modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_department.yml
diff --git a/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_mail.yml b/modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_mail.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.storage.group.field_rg_mail.yml
rename to modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_mail.yml
diff --git a/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_phone.yml b/modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_phone.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.storage.group.field_rg_phone.yml
rename to modules/ldap_research_groups_sync/config/optional/field.storage.group.field_rg_phone.yml
diff --git a/ldap_research_groups_sync/config/optional/field.storage.user.field_user_research_groups.yml b/modules/ldap_research_groups_sync/config/optional/field.storage.user.field_user_research_groups.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/field.storage.user.field_user_research_groups.yml
rename to modules/ldap_research_groups_sync/config/optional/field.storage.user.field_user_research_groups.yml
diff --git a/ldap_research_groups_sync/config/optional/group.role.research_group-admin.yml b/modules/ldap_research_groups_sync/config/optional/group.role.research_group-admin.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/group.role.research_group-admin.yml
rename to modules/ldap_research_groups_sync/config/optional/group.role.research_group-admin.yml
diff --git a/ldap_research_groups_sync/config/optional/group.role.research_group-admin_in.yml b/modules/ldap_research_groups_sync/config/optional/group.role.research_group-admin_in.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/group.role.research_group-admin_in.yml
rename to modules/ldap_research_groups_sync/config/optional/group.role.research_group-admin_in.yml
diff --git a/ldap_research_groups_sync/config/optional/group.role.research_group-admin_out.yml b/modules/ldap_research_groups_sync/config/optional/group.role.research_group-admin_out.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/group.role.research_group-admin_out.yml
rename to modules/ldap_research_groups_sync/config/optional/group.role.research_group-admin_out.yml
diff --git a/ldap_research_groups_sync/config/optional/group.role.research_group-anonymous.yml b/modules/ldap_research_groups_sync/config/optional/group.role.research_group-anonymous.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/group.role.research_group-anonymous.yml
rename to modules/ldap_research_groups_sync/config/optional/group.role.research_group-anonymous.yml
diff --git a/ldap_research_groups_sync/config/optional/group.role.research_group-member.yml b/modules/ldap_research_groups_sync/config/optional/group.role.research_group-member.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/group.role.research_group-member.yml
rename to modules/ldap_research_groups_sync/config/optional/group.role.research_group-member.yml
diff --git a/ldap_research_groups_sync/config/optional/group.role.research_group-outsider.yml b/modules/ldap_research_groups_sync/config/optional/group.role.research_group-outsider.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/group.role.research_group-outsider.yml
rename to modules/ldap_research_groups_sync/config/optional/group.role.research_group-outsider.yml
diff --git a/ldap_research_groups_sync/config/optional/group.type.research_group.yml b/modules/ldap_research_groups_sync/config/optional/group.type.research_group.yml
similarity index 100%
rename from ldap_research_groups_sync/config/optional/group.type.research_group.yml
rename to modules/ldap_research_groups_sync/config/optional/group.type.research_group.yml
diff --git a/ldap_research_groups_sync/css/role-mapping.css b/modules/ldap_research_groups_sync/css/role-mapping.css
similarity index 100%
rename from ldap_research_groups_sync/css/role-mapping.css
rename to modules/ldap_research_groups_sync/css/role-mapping.css
diff --git a/ldap_research_groups_sync/ldap_research_groups_sync.info.yml b/modules/ldap_research_groups_sync/ldap_research_groups_sync.info.yml
similarity index 100%
rename from ldap_research_groups_sync/ldap_research_groups_sync.info.yml
rename to modules/ldap_research_groups_sync/ldap_research_groups_sync.info.yml
diff --git a/ldap_research_groups_sync/ldap_research_groups_sync.install b/modules/ldap_research_groups_sync/ldap_research_groups_sync.install
similarity index 100%
rename from ldap_research_groups_sync/ldap_research_groups_sync.install
rename to modules/ldap_research_groups_sync/ldap_research_groups_sync.install
diff --git a/ldap_research_groups_sync/ldap_research_groups_sync.libraries.yml b/modules/ldap_research_groups_sync/ldap_research_groups_sync.libraries.yml
similarity index 100%
rename from ldap_research_groups_sync/ldap_research_groups_sync.libraries.yml
rename to modules/ldap_research_groups_sync/ldap_research_groups_sync.libraries.yml
diff --git a/ldap_research_groups_sync/ldap_research_groups_sync.links.menu.yml b/modules/ldap_research_groups_sync/ldap_research_groups_sync.links.menu.yml
similarity index 100%
rename from ldap_research_groups_sync/ldap_research_groups_sync.links.menu.yml
rename to modules/ldap_research_groups_sync/ldap_research_groups_sync.links.menu.yml
diff --git a/ldap_research_groups_sync/ldap_research_groups_sync.links.task.yml b/modules/ldap_research_groups_sync/ldap_research_groups_sync.links.task.yml
similarity index 100%
rename from ldap_research_groups_sync/ldap_research_groups_sync.links.task.yml
rename to modules/ldap_research_groups_sync/ldap_research_groups_sync.links.task.yml
diff --git a/ldap_research_groups_sync/ldap_research_groups_sync.module b/modules/ldap_research_groups_sync/ldap_research_groups_sync.module
similarity index 100%
rename from ldap_research_groups_sync/ldap_research_groups_sync.module
rename to modules/ldap_research_groups_sync/ldap_research_groups_sync.module
diff --git a/ldap_research_groups_sync/ldap_research_groups_sync.permissions.yml b/modules/ldap_research_groups_sync/ldap_research_groups_sync.permissions.yml
similarity index 100%
rename from ldap_research_groups_sync/ldap_research_groups_sync.permissions.yml
rename to modules/ldap_research_groups_sync/ldap_research_groups_sync.permissions.yml
diff --git a/ldap_research_groups_sync/ldap_research_groups_sync.routing.yml b/modules/ldap_research_groups_sync/ldap_research_groups_sync.routing.yml
similarity index 100%
rename from ldap_research_groups_sync/ldap_research_groups_sync.routing.yml
rename to modules/ldap_research_groups_sync/ldap_research_groups_sync.routing.yml
diff --git a/ldap_research_groups_sync/ldap_research_groups_sync.services.yml b/modules/ldap_research_groups_sync/ldap_research_groups_sync.services.yml
similarity index 100%
rename from ldap_research_groups_sync/ldap_research_groups_sync.services.yml
rename to modules/ldap_research_groups_sync/ldap_research_groups_sync.services.yml
diff --git a/ldap_research_groups_sync/scripts/install_field_rg_department.php b/modules/ldap_research_groups_sync/scripts/install_field_rg_department.php
similarity index 100%
rename from ldap_research_groups_sync/scripts/install_field_rg_department.php
rename to modules/ldap_research_groups_sync/scripts/install_field_rg_department.php
diff --git a/ldap_research_groups_sync/src/Form/AccessRuleForm.php b/modules/ldap_research_groups_sync/src/Form/AccessRuleForm.php
similarity index 100%
rename from ldap_research_groups_sync/src/Form/AccessRuleForm.php
rename to modules/ldap_research_groups_sync/src/Form/AccessRuleForm.php
diff --git a/ldap_research_groups_sync/src/Form/AccessRulesForm.php b/modules/ldap_research_groups_sync/src/Form/AccessRulesForm.php
similarity index 100%
rename from ldap_research_groups_sync/src/Form/AccessRulesForm.php
rename to modules/ldap_research_groups_sync/src/Form/AccessRulesForm.php
diff --git a/ldap_research_groups_sync/src/Form/LdapResearchGroupsSyncConfigForm.php b/modules/ldap_research_groups_sync/src/Form/LdapResearchGroupsSyncConfigForm.php
similarity index 100%
rename from ldap_research_groups_sync/src/Form/LdapResearchGroupsSyncConfigForm.php
rename to modules/ldap_research_groups_sync/src/Form/LdapResearchGroupsSyncConfigForm.php
diff --git a/ldap_research_groups_sync/src/LdapResearchGroupsSync.php b/modules/ldap_research_groups_sync/src/LdapResearchGroupsSync.php
similarity index 100%
rename from ldap_research_groups_sync/src/LdapResearchGroupsSync.php
rename to modules/ldap_research_groups_sync/src/LdapResearchGroupsSync.php
diff --git a/ldap_research_groups_sync/src/Plugin/EntityReferenceSelection/ResearchGroupSelection.php b/modules/ldap_research_groups_sync/src/Plugin/EntityReferenceSelection/ResearchGroupSelection.php
similarity index 100%
rename from ldap_research_groups_sync/src/Plugin/EntityReferenceSelection/ResearchGroupSelection.php
rename to modules/ldap_research_groups_sync/src/Plugin/EntityReferenceSelection/ResearchGroupSelection.php
diff --git a/ldap_research_groups_sync/translations/ldap_research_groups_sync.pt-br.po b/modules/ldap_research_groups_sync/translations/ldap_research_groups_sync.pt-br.po
similarity index 100%
rename from ldap_research_groups_sync/translations/ldap_research_groups_sync.pt-br.po
rename to modules/ldap_research_groups_sync/translations/ldap_research_groups_sync.pt-br.po