diff --git a/npm/ng-packs/packages/core/src/lib/core.module.ts b/npm/ng-packs/packages/core/src/lib/core.module.ts
index d967ae74c9..b0659fcd18 100644
--- a/npm/ng-packs/packages/core/src/lib/core.module.ts
+++ b/npm/ng-packs/packages/core/src/lib/core.module.ts
@@ -8,21 +8,21 @@ import { NgxsStoragePluginModule } from '@ngxs/storage-plugin';
 import { NgxsModule, NGXS_PLUGINS } from '@ngxs/store';
 import { DynamicLayoutComponent } from './components/dynamic-layout.component';
 import { RouterOutletComponent } from './components/router-outlet.component';
+import { AutofocusDirective } from './directives/autofocus.directive';
+import { InputEventDebounceDirective } from './directives/debounce.directive';
+import { EllipsisDirective } from './directives/ellipsis.directive';
+import { FormSubmitDirective } from './directives/form-submit.directive';
 import { PermissionDirective } from './directives/permission.directive';
+import { ClickEventStopPropagationDirective } from './directives/stop-propagation.directive';
 import { VisibilityDirective } from './directives/visibility.directive';
 import { ApiInterceptor } from './interceptors/api.interceptor';
 import { ABP } from './models/common';
 import { LocalizationPipe } from './pipes/localization.pipe';
-import { ConfigPlugin, NGXS_CONFIG_PLUGIN_OPTIONS } from './plugins/config.plugin';
+import { ConfigPlugin, NGXS_CONFIG_PLUGIN_OPTIONS } from './plugins/config/config.plugin';
 import { ConfigState } from './states/config.state';
 import { ProfileState } from './states/profile.state';
 import { SessionState } from './states/session.state';
 import { getInitialData } from './utils/initial-utils';
-import { EllipsisDirective } from './directives/ellipsis.directive';
-import { AutofocusDirective } from './directives/autofocus.directive';
-import { InputEventDebounceDirective } from './directives/debounce.directive';
-import { ClickEventStopPropagationDirective } from './directives/stop-propagation.directive';
-import { FormSubmitDirective } from './directives/form-submit.directive';
 
 @NgModule({
   imports: [
diff --git a/npm/ng-packs/packages/core/src/lib/plugins/config.plugin.ts b/npm/ng-packs/packages/core/src/lib/plugins/config/config.plugin.ts
similarity index 96%
rename from npm/ng-packs/packages/core/src/lib/plugins/config.plugin.ts
rename to npm/ng-packs/packages/core/src/lib/plugins/config/config.plugin.ts
index 05f7a12250..361c48b08b 100644
--- a/npm/ng-packs/packages/core/src/lib/plugins/config.plugin.ts
+++ b/npm/ng-packs/packages/core/src/lib/plugins/config/config.plugin.ts
@@ -2,8 +2,8 @@ import { Inject, Injectable, InjectionToken } from '@angular/core';
 import { Router, Routes } from '@angular/router';
 import { actionMatcher, InitState, NgxsNextPluginFn, NgxsPlugin, setValue, UpdateState } from '@ngxs/store';
 import snq from 'snq';
-import { ABP } from '../models';
-import { organizeRoutes } from '../utils/route-utils';
+import { ABP } from '../../models';
+import { organizeRoutes } from '../../utils/route-utils';
 
 export const NGXS_CONFIG_PLUGIN_OPTIONS = new InjectionToken('NGXS_CONFIG_PLUGIN_OPTIONS');
 
diff --git a/npm/ng-packs/packages/core/src/lib/plugins/index.ts b/npm/ng-packs/packages/core/src/lib/plugins/index.ts
index 42ab2f291c..7107ea01dd 100644
--- a/npm/ng-packs/packages/core/src/lib/plugins/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/plugins/index.ts
@@ -1 +1 @@
-export * from './config.plugin';
+export * from './config/config.plugin';
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/abstracts/toaster.ts b/npm/ng-packs/packages/theme-shared/src/lib/abstracts/toaster.ts
index ece1288c7a..57870ec620 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/abstracts/toaster.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/abstracts/toaster.ts
@@ -31,8 +31,8 @@ export class AbstractToaster<T = Toaster.Options> {
 
     this.messageService.add({
       severity,
-      detail: message,
-      summary: title,
+      detail: message || '',
+      summary: title || '',
       ...options,
       key: this.key,
       ...(typeof (options || ({} as any)).sticky === 'undefined' && { sticky: this.sticky }),