BugFixing: Routing to company.module, persons.module
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 5dce8d7..7277ba1 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -25,6 +25,10 @@
     loadChildren: './pages/company/company.module#CompanyModule',
   },
   {
+    path: PATH.PERSONS,
+    loadChildren: './pages/persons/persons.module#PersonsModule',
+  },
+  {
     path: 'admin',
     loadChildren: './pages/admin/admin.module#AdminModule',
   },
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 838fec4..e7f4ea9 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -30,12 +30,10 @@
 
 //Feature Modules
 import { ContactsModule } from '@pages/contacts/contacts.module';
-import { PersonsModule } from '@pages/persons/persons.module';
-import { CompanyModule } from '@pages/company/company.module';
 import { LogoutModule } from '@pages/logout/logout.module';
 
 // Store
-import { reducers } from '@shared/store';
+import { adminReducers, companyReducers, personsReducers, reducers } from '@shared/store';
 
 // Guards
 import { AdminGuard } from '@shared/guards/admin.guard';
@@ -53,7 +51,6 @@
 import { environment } from 'environments/environment';
 import { ContainersModule } from '@shared/containers';
 import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { CompanyRoutingModule } from './pages/company/company.routing.module';
 
 /**
  * Get the BaseHref which is defined in the index.html ( <base href="/"> ).
@@ -105,9 +102,11 @@
       logOnly: environment.production,
     }),
 
+    StoreModule.forFeature('admin', adminReducers),
+    StoreModule.forFeature('person', personsReducers),
+    StoreModule.forFeature('company', companyReducers),
     ContainersModule,
     ContactsModule,
-    PersonsModule,
     AppRoutingModule,
     NgbModalModule,
     LogoutModule,
diff --git a/src/app/pages/admin/admin.module.ts b/src/app/pages/admin/admin.module.ts
index 6eae4e6..390d183 100644
--- a/src/app/pages/admin/admin.module.ts
+++ b/src/app/pages/admin/admin.module.ts
@@ -1,4 +1,4 @@
- /********************************************************************************
+/********************************************************************************
  * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -38,7 +38,7 @@
 import { AdminRoutingModule } from '@pages/admin/admin-routing.module';
 import { SalutationsListComponent } from '@pages/admin/salutations/salutations-list/salutations-list.component';
 import { CommunicationTypesListComponent } from '@pages/admin/communication-types/communication-types-list/communication-types-list.component';
-import { adminReducers } from '@shared/store';
+import { adminReducers, companyReducers, personsReducers } from '@shared/store';
 import { PersonTypesListComponent } from '@pages/admin/person-types/person-types-list/person-types-list.component';
 import { PersonTypesSandbox } from '@pages/admin/person-types/person-types.sandbox';
 import { PersonTypesApiClient } from '@pages/admin/person-types/person-types-api-client';
@@ -65,7 +65,6 @@
     NgrxFormsModule,
     RouterModule,
     FormsModule,
-    StoreModule.forFeature('admin', adminReducers),
     EffectsModule.forFeature([SalutationsEffects, CommunicationTypesEffects, PersonTypesEffects, AddressTypesEffects]),
     AgGridModule.withComponents([]),
     AdminRoutingModule,
@@ -78,7 +77,7 @@
     PersonTypesListComponent,
     PersonTypesDetailsComponent,
     AddressTypesListComponent,
-    AddressTypesDetailsComponent
+    AddressTypesDetailsComponent,
   ],
   providers: [
     SalutationsService,
@@ -97,6 +96,6 @@
     AddressTypesService,
     AddressTypesApiClient,
     AddressTypesResolver,
-  ]
+  ],
 })
-export class AdminModule { }
+export class AdminModule {}
diff --git a/src/app/pages/company/company.module.ts b/src/app/pages/company/company.module.ts
index 436a0b4..d715d65 100644
--- a/src/app/pages/company/company.module.ts
+++ b/src/app/pages/company/company.module.ts
@@ -46,6 +46,8 @@
 import { ContactPersonAddressListComponent } from '@pages/company/company-details/contact-person-details/address-list/address-list.component';
 import { ContactPersonCommunicationsDataListComponent } from '@pages/company/company-details/contact-person-details/communications-data-list/communications-data-list.component';
 import { ContactPersonCommunicationsDataDetailsComponent } from '@pages/company/company-details/contact-person-details/communications-data-details/communications-data-details.component';
+import { CommunicationTypesSandbox } from '../admin/communication-types/communication-types.sandbox';
+import { AddressTypesSandbox } from '../admin/address-types/address-types.sandbox';
 
 @NgModule({
   imports: [
@@ -79,6 +81,15 @@
     ContactPersonCommunicationsDataListComponent,
     ContactPersonCommunicationsDataDetailsComponent,
   ],
-  providers: [CompanyService, CompanyApiClient, CompanyDetailsSandBox, CompanyDetailsResolver, ContactPersonDetailsSandbox, ContactPersonDetailsResolver],
+  providers: [
+    CompanyService,
+    CompanyApiClient,
+    CompanyDetailsSandBox,
+    CompanyDetailsResolver,
+    ContactPersonDetailsSandbox,
+    CommunicationTypesSandbox,
+    AddressTypesSandbox,
+    ContactPersonDetailsResolver,
+  ],
 })
 export class CompanyModule {}
diff --git a/src/app/pages/persons/persons.module.ts b/src/app/pages/persons/persons.module.ts
index 079d71b..4b5657c 100644
--- a/src/app/pages/persons/persons.module.ts
+++ b/src/app/pages/persons/persons.module.ts
@@ -49,6 +49,10 @@
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { AngularFontAwesomeModule } from 'angular-font-awesome';
 import { LdapUserEffect } from '@shared/store/effects/users/ldap-user.effect';
+import { SalutationsSandbox } from '../admin/salutations/salutations.sandbox';
+import { CommunicationTypesSandbox } from '../admin/communication-types/communication-types.sandbox';
+import { PersonTypesSandbox } from '../admin/person-types/person-types.sandbox';
+import { AddressTypesSandbox } from '../admin/address-types/address-types.sandbox';
 
 @NgModule({
   imports: [
@@ -82,6 +86,17 @@
     ExternalPersonAddressDetailsComponent,
     InternalPersonAddressDetailsComponent,
   ],
-  providers: [PersonsService, PersonsApiClient, ExternalPersonDetailsSandBox, ExternalPersonResolver, InternalPersonDetailsSandBox, InternalPersonResolver],
+  providers: [
+    AddressTypesSandbox,
+    PersonTypesSandbox,
+    CommunicationTypesSandbox,
+    PersonsService,
+    PersonsApiClient,
+    ExternalPersonDetailsSandBox,
+    ExternalPersonResolver,
+    InternalPersonDetailsSandBox,
+    InternalPersonResolver,
+    SalutationsSandbox,
+  ],
 })
 export class PersonsModule {}
diff --git a/src/app/pages/persons/persons.routing.module.ts b/src/app/pages/persons/persons.routing.module.ts
index 59faa18..fbac3c1 100644
--- a/src/app/pages/persons/persons.routing.module.ts
+++ b/src/app/pages/persons/persons.routing.module.ts
@@ -1,4 +1,4 @@
- /********************************************************************************
+/********************************************************************************
  * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -22,40 +22,40 @@
 
 const editPersonRoutes: Routes = [
   {
-    path: `${PATH.PERSONS}/${PATH.EXTERNAL}/:contactId`,
+    path: `${PATH.EXTERNAL}/:contactId`,
     component: ExternalPersonDetailsComponent,
     resolve: {
       externalPerson: ExternalPersonResolver,
     },
   },
   {
-    path: `${PATH.PERSONS}/${PATH.INTERNAL}/:contactId`,
+    path: `${PATH.INTERNAL}/:contactId`,
     component: InternalPersonDetailsComponent,
     resolve: {
       internalPerson: InternalPersonResolver,
     },
-  }
+  },
 ];
 
 const addNewPersonRoutes: Routes = [
   {
-    path: `${PATH.PERSONS}/${PATH.EXTERNAL}/${PATH.NEW}`,
+    path: `${PATH.EXTERNAL}/${PATH.NEW}`,
     component: ExternalPersonDetailsComponent,
     resolve: {
-      externalPerson: ExternalPersonResolver
+      externalPerson: ExternalPersonResolver,
     },
   },
   {
-    path: `${PATH.PERSONS}/${PATH.INTERNAL}/${PATH.NEW}`,
+    path: `${PATH.INTERNAL}/${PATH.NEW}`,
     component: InternalPersonDetailsComponent,
     resolve: {
-      externalPerson: InternalPersonResolver
+      externalPerson: InternalPersonResolver,
     },
   },
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot([...editPersonRoutes,...addNewPersonRoutes])],
-  exports: [RouterModule]
+  imports: [RouterModule.forChild([...editPersonRoutes, ...addNewPersonRoutes])],
+  exports: [RouterModule],
 })
-export class PersonsRoutingModule { }
+export class PersonsRoutingModule {}