diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts
index 5094201841..a5c844a118 100644
--- a/src/app/+admin/admin-routing.module.ts
+++ b/src/app/+admin/admin-routing.module.ts
@@ -18,8 +18,8 @@ import { ACCESS_CONTROL_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-rout
       },
       {
         path: ACCESS_CONTROL_MODULE_PATH,
-        loadChildren: () => import('../admin-access-control/admin-access-control.module')
-          .then((m) => m.AdminAccessControlModule),
+        loadChildren: () => import('../access-control/access-control.module')
+          .then((m) => m.AccessControlModule),
       },
       {
         path: 'search',
diff --git a/src/app/+admin/admin.module.ts b/src/app/+admin/admin.module.ts
index a1a5caaf99..25cdd67dcf 100644
--- a/src/app/+admin/admin.module.ts
+++ b/src/app/+admin/admin.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '../shared/shared.module';
-import { AdminAccessControlModule } from '../admin-access-control/admin-access-control.module';
+import { AccessControlModule } from '../access-control/access-control.module';
 import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
 import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
 import { AdminRoutingModule } from './admin-routing.module';
@@ -21,7 +21,7 @@ const ENTRY_COMPONENTS = [
   imports: [
     AdminRoutingModule,
     AdminRegistriesModule,
-    AdminAccessControlModule,
+    AccessControlModule,
     AdminSearchModule.withEntryComponents(),
     AdminWorkflowModuleModule.withEntryComponents(),
     SharedModule,
diff --git a/src/app/admin-access-control/admin-access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
similarity index 100%
rename from src/app/admin-access-control/admin-access-control-routing-paths.ts
rename to src/app/access-control/access-control-routing-paths.ts
diff --git a/src/app/admin-access-control/admin-access-control-routing.module.ts b/src/app/access-control/access-control-routing.module.ts
similarity index 90%
rename from src/app/admin-access-control/admin-access-control-routing.module.ts
rename to src/app/access-control/access-control-routing.module.ts
index 10ac117b0f..2dbba19f70 100644
--- a/src/app/admin-access-control/admin-access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { GroupFormComponent } from './group-registry/group-form/group-form.component';
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-import { GROUP_EDIT_PATH } from './admin-access-control-routing-paths';
+import { GROUP_EDIT_PATH } from './access-control-routing-paths';
 
 @NgModule({
   imports: [
@@ -26,6 +26,6 @@ import { GROUP_EDIT_PATH } from './admin-access-control-routing-paths';
 /**
  * Routing module for the AccessControl section of the admin sidebar
  */
-export class AdminAccessControlRoutingModule {
+export class AccessControlRoutingModule {
 
 }
diff --git a/src/app/admin-access-control/admin-access-control.module.ts b/src/app/access-control/access-control.module.ts
similarity index 87%
rename from src/app/admin-access-control/admin-access-control.module.ts
rename to src/app/access-control/access-control.module.ts
index c26191c376..0e872458bd 100644
--- a/src/app/admin-access-control/admin-access-control.module.ts
+++ b/src/app/access-control/access-control.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { SharedModule } from '../shared/shared.module';
-import { AdminAccessControlRoutingModule } from './admin-access-control-routing.module';
+import { AccessControlRoutingModule } from './access-control-routing.module';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
 import { GroupFormComponent } from './group-registry/group-form/group-form.component';
@@ -15,7 +15,7 @@ import { GroupsRegistryComponent } from './group-registry/groups-registry.compon
     CommonModule,
     SharedModule,
     RouterModule,
-    AdminAccessControlRoutingModule
+    AccessControlRoutingModule
   ],
   declarations: [
     EPeopleRegistryComponent,
@@ -29,6 +29,6 @@ import { GroupsRegistryComponent } from './group-registry/groups-registry.compon
 /**
  * This module handles all components related to the access control pages
  */
-export class AdminAccessControlModule {
+export class AccessControlModule {
 
 }
diff --git a/src/app/admin-access-control/epeople-registry/epeople-registry.actions.ts b/src/app/access-control/epeople-registry/epeople-registry.actions.ts
similarity index 100%
rename from src/app/admin-access-control/epeople-registry/epeople-registry.actions.ts
rename to src/app/access-control/epeople-registry/epeople-registry.actions.ts
diff --git a/src/app/admin-access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
similarity index 100%
rename from src/app/admin-access-control/epeople-registry/epeople-registry.component.html
rename to src/app/access-control/epeople-registry/epeople-registry.component.html
diff --git a/src/app/admin-access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
similarity index 100%
rename from src/app/admin-access-control/epeople-registry/epeople-registry.component.spec.ts
rename to src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
diff --git a/src/app/admin-access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts
similarity index 100%
rename from src/app/admin-access-control/epeople-registry/epeople-registry.component.ts
rename to src/app/access-control/epeople-registry/epeople-registry.component.ts
diff --git a/src/app/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts
similarity index 100%
rename from src/app/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts
rename to src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts
diff --git a/src/app/admin-access-control/epeople-registry/epeople-registry.reducers.ts b/src/app/access-control/epeople-registry/epeople-registry.reducers.ts
similarity index 100%
rename from src/app/admin-access-control/epeople-registry/epeople-registry.reducers.ts
rename to src/app/access-control/epeople-registry/epeople-registry.reducers.ts
diff --git a/src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
similarity index 100%
rename from src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html
rename to src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
diff --git a/src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
similarity index 100%
rename from src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
rename to src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
diff --git a/src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
similarity index 100%
rename from src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts
rename to src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
diff --git a/src/app/admin-access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-form/group-form.component.html
rename to src/app/access-control/group-registry/group-form/group-form.component.html
diff --git a/src/app/admin-access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-form/group-form.component.spec.ts
rename to src/app/access-control/group-registry/group-form/group-form.component.spec.ts
diff --git a/src/app/admin-access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-form/group-form.component.ts
rename to src/app/access-control/group-registry/group-form/group-form.component.ts
diff --git a/src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.html
rename to src/app/access-control/group-registry/group-form/members-list/members-list.component.html
diff --git a/src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts
rename to src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
diff --git a/src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.ts
rename to src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
diff --git a/src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
rename to src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
diff --git a/src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
rename to src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
diff --git a/src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
rename to src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
diff --git a/src/app/admin-access-control/group-registry/group-registry.actions.ts b/src/app/access-control/group-registry/group-registry.actions.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-registry.actions.ts
rename to src/app/access-control/group-registry/group-registry.actions.ts
diff --git a/src/app/admin-access-control/group-registry/group-registry.reducers.spec.ts b/src/app/access-control/group-registry/group-registry.reducers.spec.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-registry.reducers.spec.ts
rename to src/app/access-control/group-registry/group-registry.reducers.spec.ts
diff --git a/src/app/admin-access-control/group-registry/group-registry.reducers.ts b/src/app/access-control/group-registry/group-registry.reducers.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/group-registry.reducers.ts
rename to src/app/access-control/group-registry/group-registry.reducers.ts
diff --git a/src/app/admin-access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
similarity index 100%
rename from src/app/admin-access-control/group-registry/groups-registry.component.html
rename to src/app/access-control/group-registry/groups-registry.component.html
diff --git a/src/app/admin-access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/groups-registry.component.spec.ts
rename to src/app/access-control/group-registry/groups-registry.component.spec.ts
diff --git a/src/app/admin-access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
similarity index 100%
rename from src/app/admin-access-control/group-registry/groups-registry.component.ts
rename to src/app/access-control/group-registry/groups-registry.component.ts
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index dceb779fad..ab0c31b41c 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -3,11 +3,11 @@ import { ActionReducerMap, createSelector, MemoizedSelector } from '@ngrx/store'
 import {
   ePeopleRegistryReducer,
   EPeopleRegistryState
-} from './admin-access-control/epeople-registry/epeople-registry.reducers';
+} from './access-control/epeople-registry/epeople-registry.reducers';
 import {
   groupRegistryReducer,
   GroupRegistryState
-} from './admin-access-control/group-registry/group-registry.reducers';
+} from './access-control/group-registry/group-registry.reducers';
 import {
   metadataRegistryReducer,
   MetadataRegistryState
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index f403dd4cc0..cd7b664379 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -10,7 +10,7 @@ import { TestScheduler } from 'rxjs/testing';
 import {
   EPeopleRegistryCancelEPersonAction,
   EPeopleRegistryEditEPersonAction
-} from '../../admin-access-control/epeople-registry/epeople-registry.actions';
+} from '../../access-control/epeople-registry/epeople-registry.actions';
 import { RequestParam } from '../cache/models/request-param.model';
 import { CoreState } from '../core.reducers';
 import { ChangeAnalyzer } from '../data/change-analyzer';
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index 152b3c3c11..5b52510ddd 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -7,8 +7,8 @@ import { find, map, take } from 'rxjs/operators';
 import {
   EPeopleRegistryCancelEPersonAction,
   EPeopleRegistryEditEPersonAction
-} from '../../admin-access-control/epeople-registry/epeople-registry.actions';
-import { EPeopleRegistryState } from '../../admin-access-control/epeople-registry/epeople-registry.reducers';
+} from '../../access-control/epeople-registry/epeople-registry.actions';
+import { EPeopleRegistryState } from '../../access-control/epeople-registry/epeople-registry.reducers';
 import { AppState } from '../../app.reducer';
 import { hasValue, hasNoValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts
index b39a58c83d..378c3c9667 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -8,7 +8,7 @@ import { compare, Operation } from 'fast-json-patch';
 import {
   GroupRegistryCancelGroupAction,
   GroupRegistryEditGroupAction
-} from '../../admin-access-control/group-registry/group-registry.actions';
+} from '../../access-control/group-registry/group-registry.actions';
 import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
 import { RequestParam } from '../cache/models/request-param.model';
 import { CoreState } from '../core.reducers';
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index 3e5424b376..cff1c37f09 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -7,8 +7,8 @@ import { filter, map, take } from 'rxjs/operators';
 import {
   GroupRegistryCancelGroupAction,
   GroupRegistryEditGroupAction
-} from '../../admin-access-control/group-registry/group-registry.actions';
-import { GroupRegistryState } from '../../admin-access-control/group-registry/group-registry.reducers';
+} from '../../access-control/group-registry/group-registry.actions';
+import { GroupRegistryState } from '../../access-control/group-registry/group-registry.reducers';
 import { AppState } from '../../app.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
index 65a0881fc7..d155d66a0a 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
@@ -9,7 +9,7 @@ import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../../..
 import { RequestService } from '../../../../core/data/request.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { HALLink } from '../../../../core/shared/hal-link.model';
-import { getGroupEditRoute } from '../../../../admin-access-control/admin-access-control-routing-paths';
+import { getGroupEditRoute } from '../../../../access-control/access-control-routing-paths';
 import { hasNoValue, hasValue } from '../../../empty.util';
 import { NoContent } from '../../../../core/shared/NoContent.model';
 
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index 38981b4f05..2b21d69d34 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -32,7 +32,7 @@ import { NotificationsService } from '../notifications/notifications.service';
 import { dateToString, stringToNgbDateStruct } from '../date.util';
 import { followLink } from '../utils/follow-link-config.model';
 import { ADMIN_MODULE_PATH } from '../../app-routing-paths';
-import { GROUP_EDIT_PATH } from '../../admin-access-control/admin-access-control-routing-paths';
+import { GROUP_EDIT_PATH } from '../../access-control/access-control-routing-paths';
 import { ACCESS_CONTROL_MODULE_PATH } from '../../+admin/admin-routing-paths';
 
 interface ResourcePolicyCheckboxEntry {