diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 39642b81..0731eb04 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -5,9 +5,9 @@ import {RouteConfig} from '@angular/router-deprecated';
 
 import {Pages} from './pages';
 import {AppState} from './app.state';
-import {BaThemeConfigProvider, BaThemeConfig, BaThemeSpinner} from './theme';
+import {BaThemeConfigProvider, BaThemeConfig} from './theme';
 import {BaThemeRun} from './theme/directives';
-import {BaImageLoaderService, BaThemePreloader} from './theme/services';
+import {BaImageLoaderService, BaThemePreloader, BaThemeSpinner} from './theme/services';
 
 import {layoutPaths} from './theme/theme.constants';
 
diff --git a/src/app/theme/index.ts b/src/app/theme/index.ts
index c2d456a6..df82c5e2 100644
--- a/src/app/theme/index.ts
+++ b/src/app/theme/index.ts
@@ -1,4 +1,3 @@
-export * from './theme.spinner'
 export * from './theme.constants'
 export * from './theme.configProvider'
 export * from './theme.config'
diff --git a/src/app/theme/theme.spinner.ts b/src/app/theme/services/baThemeSpinner/baThemeSpinner.service.ts
similarity index 100%
rename from src/app/theme/theme.spinner.ts
rename to src/app/theme/services/baThemeSpinner/baThemeSpinner.service.ts
diff --git a/src/app/theme/services/baThemeSpinner/index.ts b/src/app/theme/services/baThemeSpinner/index.ts
new file mode 100644
index 00000000..8c5970cb
--- /dev/null
+++ b/src/app/theme/services/baThemeSpinner/index.ts
@@ -0,0 +1 @@
+export * from './baThemeSpinner.service';
diff --git a/src/app/theme/services/index.ts b/src/app/theme/services/index.ts
index e743f90c..ce11a082 100644
--- a/src/app/theme/services/index.ts
+++ b/src/app/theme/services/index.ts
@@ -1,2 +1,3 @@
 export * from './baImageLoader';
 export * from './baThemePreloader';
+export * from './baThemeSpinner';