diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index a0eae51b11..bc6f27b556 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -3,10 +3,10 @@ import * as moment from 'moment';
 import { combineLatest, Observable, of } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
+import { BaseEndpointAuth } from '../../core/src/core/endpoint-auth';
 import { urlValidationExpression } from '../../core/src/core/utils.service';
 import { AppState, GeneralEntityAppState } from '../../store/src/app-state';
 import { metricEntityType } from '../../store/src/base-entity-schemas';
-import { BaseEndpointAuth } from '../../store/src/endpoint-auth';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
index 128aed0b52..7f1d67b662 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
@@ -5,7 +5,7 @@ import { EffectsModule } from '@ngrx/effects';
 import { generateASEntities } from '../../cf-autoscaler/src/store/autoscaler-entity-generator';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../core/src/core/github.helpers';
 import { LoggerService } from '../../core/src/core/logger.service';
-import { generateStratosEntities } from '../../store/src/base-entity-types';
+import { generateStratosEntities } from '../../core/src/stratos-entities';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
 import { testSCFEndpointGuid } from '../../store/testing/public-api';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
index b584a05878..50fb563f34 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
@@ -8,11 +8,9 @@ import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell, IListRowCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
 import { ComponentEntityMonitorConfig } from '../../../../../../../../store/src/types/shared.types';
 import {
   IService,
@@ -55,7 +53,7 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
     data$: Observable<string>;
     customStyle?: string;
   }[];
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
   service$: Observable<EntityInfo<APIResource<IService>> | null>;
   serviceInstance$: Observable<EntityInfo<APIResource<IServiceInstance | IUserProvidedServiceInstance>>>;
   tags$: Observable<AppChip<IServiceInstance | IUserProvidedServiceInstance>[]>;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
index bcdd032bd2..f7e4ff459b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
@@ -11,9 +11,6 @@ import {
 import { truthyIncludingZeroString } from '../../../../../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
 import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
@@ -21,6 +18,7 @@ import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { EndpointUser } from '../../../../../../../../store/src/types/endpoint.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
@@ -47,7 +45,7 @@ import { CF_ENDPOINT_TYPE } from './../../../../../../cf-types';
   styleUrls: ['./cf-org-card.component.scss']
 })
 export class CfOrgCardComponent extends CardCell<APIResource<IOrganization>> implements OnInit, OnDestroy {
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
   orgGuid: string;
   normalisedMemoryUsage: number;
   memoryLimit: string;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
index c31213505f..322d4bc454 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
@@ -12,9 +12,6 @@ import {
 import { truthyIncludingZeroString } from '../../../../../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
 import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
@@ -22,6 +19,7 @@ import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { EndpointUser } from '../../../../../../../../store/src/types/endpoint.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
@@ -47,7 +45,7 @@ import { CfUserService } from '../../../../../data-services/cf-user.service';
   styleUrls: ['./cf-space-card.component.scss']
 })
 export class CfSpaceCardComponent extends CardCell<APIResource<ISpace>> implements OnInit, OnDestroy {
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
   spaceGuid: string;
   appInstancesCount: number;
   appInstancesLimit: string;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
index 85a9dd63be..640c95bcf2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
@@ -8,11 +8,9 @@ import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
 import { ComponentEntityMonitorConfig } from '../../../../../../../../store/src/types/shared.types';
 import { IServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
@@ -104,7 +102,7 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
   static done = false;
   serviceInstanceEntity: APIResource<IServiceInstance>;
   cfGuid: string;
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
 
   serviceInstanceTags: AppChip[];
   hasMultipleBindings = new BehaviorSubject(true);
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
index a7b8310c88..0103bc36be 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
@@ -8,11 +8,9 @@ import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
 import { ComponentEntityMonitorConfig } from '../../../../../../../../store/src/types/shared.types';
 import { IUserProvidedServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
@@ -30,7 +28,7 @@ import { CSI_CANCEL_URL } from '../../../../add-service-instance/csi-mode.servic
 export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResource<IUserProvidedServiceInstance>> {
   serviceInstanceEntity: APIResource<IUserProvidedServiceInstance>;
   cfGuid: string;
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
 
   serviceInstanceTags: AppChip[];
   hasMultipleBindings = new BehaviorSubject(true);
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
index 30a0022d4b..e797eab3c8 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
@@ -7,10 +7,8 @@ import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import { cfUserEntityType, organizationEntityType, spaceEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { getCurrentUserCFGlobalStates } from '../../../../cloud-foundry/src/store/selectors/cf-current-user-role.selectors';
-import {
-  LocalPaginationHelpers,
-} from '../../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
+import { LocalPaginationHelpers } from '../../../../store/src/helpers/local-list.helpers';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import {
   getDefaultPaginationEntityState,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
index f807720b7d..c3536ed8a9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
@@ -15,10 +15,10 @@ import {
 import { PermissionConfig } from '../../../../core/src/core/permissions/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { StratosScopeStrings } from '../../../../core/src/core/permissions/stratos-user-permissions.checker';
+import { generateStratosEntities } from '../../../../core/src/stratos-entities';
 import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
 import { AppState } from '../../../../store/src/app-state';
 import { endpointEntitySchema } from '../../../../store/src/base-entity-schemas';
-import { generateStratosEntities } from '../../../../store/src/base-entity-types';
 import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../store/src/entity-catalog-test.module';
 import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../../store/src/types/api.types';
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts
index 780d481f28..fda8621a50 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts
@@ -1,5 +1,5 @@
+import { generateStratosEntities } from '../../core/src/stratos-entities';
 import { BaseTestModules } from '../../core/test-framework/core-test.helper';
-import { generateStratosEntities } from '../../store/src/base-entity-types';
 import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../store/src/entity-catalog-test.module';
 import { generateCFEntities } from '../src/cf-entity-generator';
 
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 5143286c99..f70ee4210e 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -15,7 +15,6 @@ import {
 } from '../../store/src/actions/user-favourites-actions/update-user-favorite-metadata-action';
 import { GeneralEntityAppState, GeneralRequestDataState } from '../../store/src/app-state';
 import { STRATOS_ENDPOINT_TYPE } from '../../store/src/base-entity-schemas';
-import { generateStratosEntities } from '../../store/src/base-entity-types';
 import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
 import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog';
 import { EntityCatalogHelper } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
@@ -52,6 +51,7 @@ import { CustomReuseStrategy } from './route-reuse-stragegy';
 import { endpointEventKey, GlobalEventData, GlobalEventService } from './shared/global-events.service';
 import { SidePanelService } from './shared/services/side-panel.service';
 import { SharedModule } from './shared/shared.module';
+import { generateStratosEntities } from './stratos-entities';
 
 // Create action for router navigation. See
 // - https://github.com/ngrx/platform/issues/68
diff --git a/src/frontend/packages/store/src/endpoint-auth.ts b/src/frontend/packages/core/src/core/endpoint-auth.ts
similarity index 68%
rename from src/frontend/packages/store/src/endpoint-auth.ts
rename to src/frontend/packages/core/src/core/endpoint-auth.ts
index c5f857da8b..0fa06e90d1 100644
--- a/src/frontend/packages/store/src/endpoint-auth.ts
+++ b/src/frontend/packages/core/src/core/endpoint-auth.ts
@@ -1,15 +1,11 @@
 import { Validators } from '@angular/forms';
 
+import { EndpointAuthTypeConfig, EndpointType } from '../../../store/src/extension-types';
 import {
   CredentialsAuthFormComponent,
-} from '../../core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component';
-import {
-  NoneAuthFormComponent,
-} from '../../core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component';
-import {
-  SSOAuthFormComponent,
-} from '../../core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component';
-import { EndpointAuthTypeConfig, EndpointType } from './extension-types';
+} from '../features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component';
+import { NoneAuthFormComponent } from '../features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component';
+import { SSOAuthFormComponent } from '../features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component';
 
 export enum EndpointAuthTypeNames {
   CREDS = 'creds',
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
index 0fa151e46d..60d39f5ace 100644
--- a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
@@ -4,13 +4,13 @@ import { first, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../store/src/app-state';
 import { endpointEntitySchema } from '../../../../store/src/base-entity-schemas';
-import { generateStratosEntities } from '../../../../store/src/base-entity-types';
 import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../store/src/entity-catalog-test.module';
 import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { BaseEntityValues } from '../../../../store/src/types/entity.types';
 import { PaginationState } from '../../../../store/src/types/pagination.types';
 import { AppTestModule } from '../../../test-framework/core-test.helper';
+import { generateStratosEntities } from '../../stratos-entities';
 import { PermissionConfig } from './current-user-permissions.config';
 import { CurrentUserPermissionsService } from './current-user-permissions.service';
 import { StratosPermissionStrings, StratosPermissionTypes, StratosScopeStrings } from './stratos-user-permissions.checker';
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts
index 78c10d099a..0f6bc94595 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts
@@ -14,9 +14,9 @@ import {
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Subscription } from 'rxjs';
 
-import { BaseEndpointAuth } from '../../../../../store/src/endpoint-auth';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../../../store/src/extension-types';
+import { BaseEndpointAuth } from '../../../core/endpoint-auth';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConnectEndpointConfig, ConnectEndpointData, ConnectEndpointService } from '../connect.service';
 
diff --git a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
index aeeca51973..06800db5f3 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
@@ -3,7 +3,7 @@ import { combineLatest, Observable, ReplaySubject, Subject } from 'rxjs';
 import { distinctUntilChanged, map, scan, startWith } from 'rxjs/operators';
 
 import { FavoritesConfigMapper, IFavoriteTypes } from '../../../../../store/src/favorite-config-mapper';
-import { IFavoriteEntity } from '../../../../../store/src/user-favorite-manager';
+import { IFavoriteEntity } from '../../../../../store/src/types/user-favorite-manager.types';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts
index aff1a3bb08..f8313df5a2 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts
@@ -5,12 +5,9 @@ import { map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { getFavoriteInfoObservable } from '../../../../../store/src/helpers/store-helpers';
-import {
-  IFavoriteEntity,
-  IFavoritesInfo,
-  IGroupedFavorites,
-  UserFavoriteManager,
-} from '../../../../../store/src/user-favorite-manager';
+import { IFavoriteEntity, IGroupedFavorites } from '../../../../../store/src/types/user-favorite-manager.types';
+import { IFavoritesInfo } from '../../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../../store/src/user-favorite-manager';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
index ac7488867a..44948e8559 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
@@ -11,13 +11,13 @@ import { userFavoritesEntitySchema } from '../../../../../store/src/base-entity-
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { IFavoritesMetaCardConfig } from '../../../../../store/src/favorite-config-mapper';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
+import { MenuItem } from '../../../../../store/src/types/menu-item.types';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../store/src/types/shared.types';
+import { IFavoriteEntity } from '../../../../../store/src/types/user-favorite-manager.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
-import { IFavoriteEntity } from '../../../../../store/src/user-favorite-manager';
 import { isEndpointConnected } from '../../../features/endpoints/connect.service';
 import { ConfirmationDialogConfig } from '../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../confirmation-dialog.service';
-import { MetaCardMenuItem } from '../list/list-cards/meta-card/meta-card-base/meta-card.component';
 
 
 @Component({
@@ -64,7 +64,7 @@ export class FavoritesMetaCardComponent {
   public endpointConnected$: Observable<boolean>;
   public name$: Observable<string>;
   public routerLink$: Observable<string>;
-  public actions$: Observable<MetaCardMenuItem[]>;
+  public actions$: Observable<MenuItem[]>;
 
   // Optional icon for the favorite
   public iconUrl$: Observable<string>;
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts
index b1fdfc75c7..16ea225294 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts
@@ -31,6 +31,7 @@ import { IgnorePaginationMaxedState, SetResultCount } from '../../../../../../st
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
+import { LocalPaginationHelpers } from '../../../../../../store/src/helpers/local-list.helpers';
 import { PaginationMonitor } from '../../../../../../store/src/monitors/pagination-monitor';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../../../store/src/types/pagination.types';
@@ -46,7 +47,6 @@ import {
 } from './list-data-source-types';
 import { getDataFunctionList } from './local-filtering-sorting';
 import { LocalListController } from './local-list-controller';
-import { LocalPaginationHelpers } from './local-list.helpers';
 
 export type DataFunctionDefinitionType = 'sort' | 'filter';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
index bb0fb7391f..2d53920886 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
@@ -2,10 +2,10 @@ import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { tag } from 'rxjs-spy/operators/tag';
 import { distinctUntilChanged, map, publishReplay, refCount, switchMap, tap } from 'rxjs/operators';
 
+import { LocalPaginationHelpers } from '../../../../../../store/src/helpers/local-list.helpers';
 import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 import { DataFunction } from './list-data-source';
 import { splitCurrentPage } from './local-list-controller.helpers';
-import { LocalPaginationHelpers } from './local-list.helpers';
 
 export class LocalListController<T = any> {
   public page$: Observable<T[]>;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
index bfcc9d7644..59a95244d6 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
@@ -4,6 +4,7 @@ import { first, map, tap } from 'rxjs/operators';
 
 import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
@@ -12,15 +13,6 @@ import { MetaCardItemComponent } from '../meta-card-item/meta-card-item.componen
 import { MetaCardTitleComponent } from '../meta-card-title/meta-card-title.component';
 
 
-export interface MetaCardMenuItem {
-  icon?: string;
-  label: string;
-  action: () => void;
-  can?: Observable<boolean>;
-  disabled?: Observable<boolean>;
-  separator?: boolean;
-}
-
 export function createMetaCardMenuItemSeparator() {
   return {
     label: '-',
@@ -89,7 +81,7 @@ export class MetaCardComponent implements OnDestroy {
   }
 
   @Input('actionMenu')
-  set actionMenu(actionMenu: MetaCardMenuItem[]) {
+  set actionMenu(actionMenu: MenuItem[]) {
     if (actionMenu) {
       this.pActionMenu = actionMenu.map(menuItem => {
         if (!menuItem.can) {
@@ -107,7 +99,7 @@ export class MetaCardComponent implements OnDestroy {
       );
     }
   }
-  get actionMenu(): MetaCardMenuItem[] {
+  get actionMenu(): MenuItem[] {
     return this.pActionMenu;
   }
 
@@ -115,7 +107,7 @@ export class MetaCardComponent implements OnDestroy {
 
   public showMenu$: Observable<boolean>;
   public isDeleting$: Observable<boolean> = observableOf(false);
-  private pActionMenu: MetaCardMenuItem[];
+  private pActionMenu: MenuItem[];
 
   constructor(
     private entityMonitorFactory: EntityMonitorFactory,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
index 3ef07992cf..f275f03966 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
@@ -21,14 +21,12 @@ import {
 } from '../../../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
 import { StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { UserFavoriteEndpoint } from '../../../../../../../../store/src/types/user-favorites.types';
 import { safeUnsubscribe } from '../../../../../../core/utils.service';
 import { coreEndpointListDetailsComponents } from '../../../../../../features/endpoints/endpoint-helpers';
-import {
-  createMetaCardMenuItemSeparator,
-  MetaCardMenuItem,
-} from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
+import { createMetaCardMenuItemSeparator } from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../list.types';
 import { BaseEndpointsDataSource } from '../base-endpoints-data-source';
 import { EndpointListDetailsComponent, EndpointListHelper } from '../endpoint-list.helpers';
@@ -46,7 +44,7 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
   public rowObs = new ReplaySubject<EndpointModel>();
   public favorite: UserFavoriteEndpoint;
   public address: string;
-  public cardMenu: MetaCardMenuItem[];
+  public cardMenu: MenuItem[];
   public endpointCatalogEntity: StratosCatalogEndpointEntity;
   public hasDetails = true;
   public endpointLink: string = null;
diff --git a/src/frontend/packages/core/src/stratos-entities.ts b/src/frontend/packages/core/src/stratos-entities.ts
new file mode 100644
index 0000000000..539aec7e4c
--- /dev/null
+++ b/src/frontend/packages/core/src/stratos-entities.ts
@@ -0,0 +1,33 @@
+import {
+  DefaultEndpointCatalogEntity,
+  SystemInfoCatalogEntity,
+  UserFavoriteCatalogEntity,
+  UserProfileCatalogEntity,
+} from '../../store/src/base-entity-types';
+import { StratosCatalogEndpointEntity } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { BaseEndpointAuth } from './core/endpoint-auth';
+import {
+  MetricsEndpointDetailsComponent,
+} from './features/metrics/metrics-endpoint-details/metrics-endpoint-details.component';
+
+export function generateStratosEntities() {
+  return [
+    new DefaultEndpointCatalogEntity(),
+    new SystemInfoCatalogEntity(),
+    new UserFavoriteCatalogEntity(),
+    new UserProfileCatalogEntity(),
+    // TODO: metrics location to be sorted - STRAT-152
+    new StratosCatalogEndpointEntity({
+      type: 'metrics',
+      label: 'Metrics',
+      labelPlural: 'Metrics',
+      tokenSharing: true,
+      logoUrl: '/core/assets/endpoint-icons/metrics.svg',
+      authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None],
+      renderPriority: 1,
+      listDetailsComponent: MetricsEndpointDetailsComponent,
+    },
+      metadata => `/endpoints/metrics/${metadata.guid}`
+    )
+  ];
+}
diff --git a/src/frontend/packages/core/test-framework/core-test.modules.ts b/src/frontend/packages/core/test-framework/core-test.modules.ts
index f433ecb5e6..d38e89193a 100644
--- a/src/frontend/packages/core/test-framework/core-test.modules.ts
+++ b/src/frontend/packages/core/test-framework/core-test.modules.ts
@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 
-import { generateStratosEntities } from '../../store/src/base-entity-types';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
+import { generateStratosEntities } from '../src/stratos-entities';
 
 @NgModule({
   imports: [
diff --git a/src/frontend/packages/store/ng-package.json b/src/frontend/packages/store/ng-package.json
index c77901ef24..babd6c3d91 100644
--- a/src/frontend/packages/store/ng-package.json
+++ b/src/frontend/packages/store/ng-package.json
@@ -2,6 +2,6 @@
   "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../../../dist/store",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public-api.ts"
   }
 }
\ No newline at end of file
diff --git a/src/frontend/packages/store/package.json b/src/frontend/packages/store/package.json
index cb014d0a39..0184d8f74d 100644
--- a/src/frontend/packages/store/package.json
+++ b/src/frontend/packages/store/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "store",
+  "name": "@stratosui/store",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
diff --git a/src/frontend/packages/store/src/base-entity-types.ts b/src/frontend/packages/store/src/base-entity-types.ts
index 905cdf96bd..1d034152c2 100644
--- a/src/frontend/packages/store/src/base-entity-types.ts
+++ b/src/frontend/packages/store/src/base-entity-types.ts
@@ -1,6 +1,3 @@
-import {
-  MetricsEndpointDetailsComponent,
-} from '../../core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component';
 import {
   endpointEntitySchema,
   STRATOS_ENDPOINT_TYPE,
@@ -8,11 +5,7 @@ import {
   userFavoritesEntitySchema,
   userProfileEntitySchema,
 } from './base-entity-schemas';
-import { BaseEndpointAuth } from './endpoint-auth';
-import {
-  StratosCatalogEndpointEntity,
-  StratosCatalogEntity,
-} from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { StratosCatalogEntity } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { addOrUpdateUserFavoriteMetadataReducer, deleteUserFavoriteMetadataReducer } from './reducers/favorite.reducer';
 import { systemEndpointsReducer } from './reducers/system-endpoints.reducer';
 
@@ -34,7 +27,7 @@ const stratosType = {
  * DefaultEndpointEntityType is used to represent a general endpoint
  * This should not be used to actually attempt to render an endpoint and is instead used as a way to fill the
  */
-class DefaultEndpointCatalogEntity extends StratosCatalogEntity {
+export class DefaultEndpointCatalogEntity extends StratosCatalogEntity {
   constructor() {
     super({
       schema: endpointEntitySchema,
@@ -48,7 +41,7 @@ class DefaultEndpointCatalogEntity extends StratosCatalogEntity {
   }
 }
 
-class UserFavoriteCatalogEntity extends StratosCatalogEntity {
+export class UserFavoriteCatalogEntity extends StratosCatalogEntity {
   constructor() {
     super({
       schema: userFavoritesEntitySchema,
@@ -63,7 +56,7 @@ class UserFavoriteCatalogEntity extends StratosCatalogEntity {
   }
 }
 
-class UserProfileCatalogEntity extends StratosCatalogEntity {
+export class UserProfileCatalogEntity extends StratosCatalogEntity {
   constructor() {
     super({
       schema: userProfileEntitySchema,
@@ -73,7 +66,7 @@ class UserProfileCatalogEntity extends StratosCatalogEntity {
   }
 }
 
-class SystemInfoCatalogEntity extends StratosCatalogEntity {
+export class SystemInfoCatalogEntity extends StratosCatalogEntity {
   constructor() {
     super({
       schema: systemInfoEntitySchema,
@@ -83,25 +76,4 @@ class SystemInfoCatalogEntity extends StratosCatalogEntity {
   }
 }
 
-export function generateStratosEntities() {
-  return [
-    new DefaultEndpointCatalogEntity(),
-    new SystemInfoCatalogEntity(),
-    new UserFavoriteCatalogEntity(),
-    new UserProfileCatalogEntity(),
-    // TODO: metrics location to be sorted - STRAT-152
-    new StratosCatalogEndpointEntity({
-      type: 'metrics',
-      label: 'Metrics',
-      labelPlural: 'Metrics',
-      tokenSharing: true,
-      logoUrl: '/core/assets/endpoint-icons/metrics.svg',
-      authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None],
-      renderPriority: 1,
-      listDetailsComponent: MetricsEndpointDetailsComponent,
-    },
-      metadata => `/endpoints/metrics/${metadata.guid}`
-    )
-  ];
-}
 
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
index 38bd2aec54..bea826fdf0 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
@@ -2,13 +2,12 @@ import {
   EndpointListDetailsComponent,
 } from '../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
 import { endpointEntitySchema } from '../base-entity-schemas';
-import { BaseEndpointAuth } from '../endpoint-auth';
 import { EntitySchema } from '../helpers/entity-schema';
 import { TestEntityCatalog } from './entity-catalog';
 import { StratosCatalogEndpointEntity, StratosCatalogEntity } from './entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogSchemas, IStratosEndpointDefinition } from './entity-catalog.types';
 
-describe('EntityCatalogService', () => {
+fdescribe('EntityCatalogService', () => {
   let entityCatalog: TestEntityCatalog;
   function getEndpointDefinition() {
     return {
@@ -18,7 +17,7 @@ describe('EntityCatalogService', () => {
       icon: 'cloud_foundry',
       iconFont: 'stratos-icons',
       logoUrl: '/core/assets/endpoint-icons/cloudfoundry.png',
-      authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.SSO],
+      authTypes: [],
       listDetailsComponent: EndpointListDetailsComponent,
     } as IStratosEndpointDefinition;
   }
@@ -124,9 +123,7 @@ describe('EntityCatalogService', () => {
       urlValidation: false,
       unConnectable: true,
       urlValidationRegexString: 'redjecks',
-      authTypes: [
-        BaseEndpointAuth.SSO
-      ]
+      authTypes: []
     };
     const definition = {
       ...endpoint,
diff --git a/src/frontend/packages/store/src/favorite-config-mapper.ts b/src/frontend/packages/store/src/favorite-config-mapper.ts
index 7a5faf9b60..76b8a8e2b2 100644
--- a/src/frontend/packages/store/src/favorite-config-mapper.ts
+++ b/src/frontend/packages/store/src/favorite-config-mapper.ts
@@ -1,14 +1,12 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import {
-  MetaCardMenuItem,
-} from '../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { entityCatalog } from './entity-catalog/entity-catalog';
 import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogHelpers } from './entity-catalog/entity-catalog.helper';
 import { IEntityMetadata, IStratosEntityDefinition } from './entity-catalog/entity-catalog.types';
 import { EndpointModel } from './types/endpoint.types';
+import { MenuItem } from './types/menu-item.types';
 import { EntityRequestAction } from './types/request.types';
 import { IFavoriteMetadata, IFavoriteTypeInfo, UserFavorite, UserFavoriteEndpoint } from './types/user-favorites.types';
 
@@ -28,7 +26,7 @@ export interface IFavoritesMetaCardConfig {
   lines?: TFavoritesMetaCardLine[];
   routerLink?: string;
   name: string;
-  menuItems?: MetaCardMenuItem[];
+  menuItems?: MenuItem[];
 }
 
 export interface IFavoriteConfig<T, Q extends IFavoriteMetadata> {
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts b/src/frontend/packages/store/src/helpers/local-list.helpers.ts
similarity index 86%
rename from src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts
rename to src/frontend/packages/store/src/helpers/local-list.helpers.ts
index c84c1c7402..2810937aac 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts
+++ b/src/frontend/packages/store/src/helpers/local-list.helpers.ts
@@ -1,5 +1,5 @@
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { PaginationEntityState } from '../types/pagination.types';
 
 export class LocalPaginationHelpers {
 
diff --git a/src/frontend/packages/store/src/helpers/store-helpers.ts b/src/frontend/packages/store/src/helpers/store-helpers.ts
index 597e43ecf9..cac7ba4e0a 100644
--- a/src/frontend/packages/store/src/helpers/store-helpers.ts
+++ b/src/frontend/packages/store/src/helpers/store-helpers.ts
@@ -6,7 +6,7 @@ import { AppState } from '../app-state';
 import { MultiActionListEntity } from '../monitors/pagination-monitor';
 import { errorFetchingFavoritesSelector, fetchingFavoritesSelector } from '../selectors/favorite-groups.selectors';
 import { APIResource } from '../types/api.types';
-import { IFavoritesInfo } from '../user-favorite-manager';
+import { IFavoritesInfo } from '../types/user-favorites.types';
 
 
 export function getDashboardStateSessionId(username?: string) {
diff --git a/src/frontend/packages/store/src/monitors/pagination-monitor.ts b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
index a55f2910dd..c19b9db3da 100644
--- a/src/frontend/packages/store/src/monitors/pagination-monitor.ts
+++ b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
@@ -14,14 +14,12 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
-import {
-  LocalPaginationHelpers,
-} from '../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { AppState, GeneralEntityAppState, GeneralRequestDataState } from '../app-state';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
 import { EntitySchema } from '../helpers/entity-schema';
+import { LocalPaginationHelpers } from '../helpers/local-list.helpers';
 import { ActionState, ListActionState } from '../reducers/api-request-reducer/types';
 import { getCurrentPageRequestInfo } from '../reducers/pagination-reducer/pagination-reducer.types';
 import { getAPIRequestDataState, selectEntities } from '../selectors/api.selectors';
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts
index 3d8080a705..906dc3fbe7 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts
@@ -1,8 +1,6 @@
-import {
-  LocalPaginationHelpers,
-} from '../../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { IgnorePaginationMaxedState, UpdatePaginationMaxedState } from '../../actions/pagination.actions';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
+import { LocalPaginationHelpers } from '../../helpers/local-list.helpers';
 import { PaginationEntityTypeState, PaginationState } from '../../types/pagination.types';
 import { getDefaultPaginationEntityState } from './pagination-reducer-reset-pagination';
 
diff --git a/src/frontend/packages/store/src/types/menu-item.types.ts b/src/frontend/packages/store/src/types/menu-item.types.ts
new file mode 100644
index 0000000000..bb55c8f11a
--- /dev/null
+++ b/src/frontend/packages/store/src/types/menu-item.types.ts
@@ -0,0 +1,11 @@
+import { Observable } from 'rxjs';
+
+
+export interface MenuItem {
+  icon?: string;
+  label: string;
+  action: () => void;
+  can?: Observable<boolean>;
+  disabled?: Observable<boolean>;
+  separator?: boolean;
+}
diff --git a/src/frontend/packages/store/src/types/user-favorite-manager.types.ts b/src/frontend/packages/store/src/types/user-favorite-manager.types.ts
new file mode 100644
index 0000000000..3b170661a2
--- /dev/null
+++ b/src/frontend/packages/store/src/types/user-favorite-manager.types.ts
@@ -0,0 +1,27 @@
+import { TFavoriteMapperFunction } from '../favorite-config-mapper';
+import { IEndpointFavMetadata, IFavoriteMetadata, UserFavorite } from './user-favorites.types';
+
+export interface IFavoriteEntity {
+  type: string;
+  prettyName: string;
+  cardMapper: TFavoriteMapperFunction<IFavoriteMetadata>;
+  favorite: UserFavorite<IFavoriteMetadata>;
+}
+
+export interface IGroupedFavorites {
+  endpoint: IHydrationResults<IEndpointFavMetadata>;
+  entities: IHydrationResults[];
+}
+
+export interface IAllFavorites {
+  fetching: boolean;
+  error: boolean;
+  entityGroups: IGroupedFavorites[];
+}
+
+export interface IHydrationResults<T extends IFavoriteMetadata = IFavoriteMetadata> {
+  type: string;
+  cardMapper: TFavoriteMapperFunction<any>;
+  prettyName: string;
+  favorite: UserFavorite<T>;
+}
diff --git a/src/frontend/packages/store/src/types/user-favorites.types.ts b/src/frontend/packages/store/src/types/user-favorites.types.ts
index b9a52c3ffa..b92b043b41 100644
--- a/src/frontend/packages/store/src/types/user-favorites.types.ts
+++ b/src/frontend/packages/store/src/types/user-favorites.types.ts
@@ -2,6 +2,12 @@ import { IEntityMetadata } from '../entity-catalog/entity-catalog.types';
 
 export const userFavoritesPaginationKey = 'userFavorites';
 
+
+export interface IFavoritesInfo {
+  fetching: boolean;
+  error: boolean;
+}
+
 /**
  * A user favorite blueprint. Can be used to fetch the full entity from a particular endpoint.
  */
diff --git a/src/frontend/packages/store/src/user-favorite-manager.ts b/src/frontend/packages/store/src/user-favorite-manager.ts
index d6420bf804..b3fae3896c 100644
--- a/src/frontend/packages/store/src/user-favorite-manager.ts
+++ b/src/frontend/packages/store/src/user-favorite-manager.ts
@@ -6,7 +6,7 @@ import { filter, map, switchMap, tap } from 'rxjs/operators';
 import { ToggleUserFavoriteAction } from './actions/user-favourites-actions/toggle-user-favorite-action';
 import { GeneralEntityAppState, IRequestEntityTypeState } from './app-state';
 import { entityCatalog } from './entity-catalog/entity-catalog';
-import { FavoritesConfigMapper, TFavoriteMapperFunction } from './favorite-config-mapper';
+import { FavoritesConfigMapper } from './favorite-config-mapper';
 import { endpointEntitiesSelector } from './selectors/endpoint.selectors';
 import {
   errorFetchingFavoritesSelector,
@@ -16,38 +16,9 @@ import {
 } from './selectors/favorite-groups.selectors';
 import { isFavorite } from './selectors/favorite.selectors';
 import { IUserFavoritesGroups } from './types/favorite-groups.types';
+import { IGroupedFavorites, IHydrationResults } from './types/user-favorite-manager.types';
 import { IEndpointFavMetadata, IFavoriteMetadata, UserFavorite } from './types/user-favorites.types';
 
-export interface IFavoriteEntity {
-  type: string;
-  prettyName: string;
-  cardMapper: TFavoriteMapperFunction<IFavoriteMetadata>;
-  favorite: UserFavorite<IFavoriteMetadata>;
-}
-
-export interface IGroupedFavorites {
-  endpoint: IHydrationResults<IEndpointFavMetadata>;
-  entities: IHydrationResults[];
-}
-
-
-export interface IAllFavorites {
-  fetching: boolean;
-  error: boolean;
-  entityGroups: IGroupedFavorites[];
-}
-
-export interface IFavoritesInfo {
-  fetching: boolean;
-  error: boolean;
-}
-
-export interface IHydrationResults<T extends IFavoriteMetadata = IFavoriteMetadata> {
-  type: string;
-  cardMapper: TFavoriteMapperFunction<any>;
-  prettyName: string;
-  favorite: UserFavorite<T>;
-}
 @Injectable({
   providedIn: 'root'
 })
diff --git a/src/frontend/packages/store/testing/ng-package.json b/src/frontend/packages/store/testing/ng-package.json
index 87392138a4..bfa6b062cf 100644
--- a/src/frontend/packages/store/testing/ng-package.json
+++ b/src/frontend/packages/store/testing/ng-package.json
@@ -1,7 +1,7 @@
 {
-  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "$schema": "../../../../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../../../dist/store/testing",
   "lib": {
-    "entryFile": "public_api.ts"
+    "entryFile": "public-api.ts"
   }
 }
\ No newline at end of file
diff --git a/src/frontend/packages/store/testing/package.json b/src/frontend/packages/store/testing/package.json
deleted file mode 100644
index 7dd43ac8c1..0000000000
--- a/src/frontend/packages/store/testing/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "store/testing",
-  "version": "0.0.1",
-  "peerDependencies": {
-    "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
-    "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
-  }
-}
\ No newline at end of file