diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7ac406714..289a3ec0a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -24,7 +24,7 @@ import { DashboardComponent } from './dashboard/dashboard.component';
 import { ListToggleComponent } from './list-toggle/list-toggle.component';
 
 import { HttpClientInMemoryWebApiModule } from 'angular-in-memory-web-api';
-import { InMemoryConfigDataService } from './in-memory-config-data.service';
+import { InMemoryConfigDataService } from './services/in-memory-config-data.service';
 
 import { deviceID } from './api-utils';
 import { environment } from '../environments/environment';
diff --git a/src/app/charts/device-chart/device-chart.component.ts b/src/app/charts/device-chart/device-chart.component.ts
index fb6720dae..b98aa113c 100644
--- a/src/app/charts/device-chart/device-chart.component.ts
+++ b/src/app/charts/device-chart/device-chart.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { cardElevation } from '../../style';
 import { DonutChartComponent } from '../donut-chart/donut-chart.component';
 import Folder from '../../folder'
-import { FolderService } from 'src/app/folder.service';
+import { FolderService } from 'src/app/services/folder.service';
 
 @Component({
   selector: 'app-device-chart',
diff --git a/src/app/charts/folder-chart/folder-chart.component.ts b/src/app/charts/folder-chart/folder-chart.component.ts
index 9f8931167..8e965e71b 100644
--- a/src/app/charts/folder-chart/folder-chart.component.ts
+++ b/src/app/charts/folder-chart/folder-chart.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import Folder from '../../folder'
 import { cardElevation } from '../../style'
-import { FolderService } from 'src/app/folder.service';
+import { FolderService } from 'src/app/services/folder.service';
 import { DonutChartComponent } from '../donut-chart/donut-chart.component';
 
 @Component({
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index 9f03e0bf4..ef4394024 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { SystemConfigService } from '../system-config.service';
+import { SystemConfigService } from '../services/system-config.service';
 
 @Component({
   selector: 'app-dashboard',
diff --git a/src/app/http-interceptors/caching.interceptor.ts b/src/app/http-interceptors/caching.interceptor.ts
index f610d6eb8..48112b521 100644
--- a/src/app/http-interceptors/caching.interceptor.ts
+++ b/src/app/http-interceptors/caching.interceptor.ts
@@ -9,7 +9,7 @@ import {
 } from '@angular/common/http';
 import { Observable, of } from 'rxjs';
 import { tap } from 'rxjs/operators';
-import { RequestCacheService } from '../request-cache.service'
+import { RequestCacheService } from '../services/request-cache.service'
 
 @Injectable()
 export class CachingInterceptor implements HttpInterceptor {
diff --git a/src/app/http-interceptors/csrf.interceptor.ts b/src/app/http-interceptors/csrf.interceptor.ts
index 70cc07e9e..d0a4df225 100644
--- a/src/app/http-interceptors/csrf.interceptor.ts
+++ b/src/app/http-interceptors/csrf.interceptor.ts
@@ -4,7 +4,7 @@ import {
   HttpInterceptor, HttpHandler, HttpRequest, HttpHeaders
 } from '@angular/common/http';
 
-import { CookieService } from '../cookie.service';
+import { CookieService } from '../services/cookie.service';
 
 
 @Injectable()
diff --git a/src/app/lists/device-list/device-list-datasource.ts b/src/app/lists/device-list/device-list-datasource.ts
index bf266d7fc..0d60f3fe5 100644
--- a/src/app/lists/device-list/device-list-datasource.ts
+++ b/src/app/lists/device-list/device-list-datasource.ts
@@ -5,7 +5,7 @@ import { MatSort } from '@angular/material/sort';
 import { map } from 'rxjs/operators';
 import { Observable, of as observableOf, merge, Subject } from 'rxjs';
 import { Device } from '../../device';
-import { SystemConfigService } from '../../system-config.service';
+import { SystemConfigService } from '../../services/system-config.service';
 
 /**
  * Data source for the DeviceList view. This class should
diff --git a/src/app/lists/device-list/device-list.component.ts b/src/app/lists/device-list/device-list.component.ts
index d2aaabac8..55b597cc9 100644
--- a/src/app/lists/device-list/device-list.component.ts
+++ b/src/app/lists/device-list/device-list.component.ts
@@ -5,7 +5,7 @@ import { MatTable } from '@angular/material/table';
 
 import { DeviceListDataSource } from './device-list-datasource';
 import { Device } from '../../device';
-import { SystemConfigService } from '../../system-config.service';
+import { SystemConfigService } from '../../services/system-config.service';
 import { dataTableElevation } from '../../style';
 import { Subject } from 'rxjs';
 
diff --git a/src/app/lists/folder-list/folder-list-datasource.ts b/src/app/lists/folder-list/folder-list-datasource.ts
index 1a3da4be4..e107b629f 100644
--- a/src/app/lists/folder-list/folder-list-datasource.ts
+++ b/src/app/lists/folder-list/folder-list-datasource.ts
@@ -5,7 +5,7 @@ import { MatSort } from '@angular/material/sort';
 import { map } from 'rxjs/operators';
 import { Observable, of as observableOf, merge, Subject } from 'rxjs';
 import Folder from '../../folder';
-import { SystemConfigService } from '../../system-config.service';
+import { SystemConfigService } from '../../services/system-config.service';
 
 /**
  * Data source for the FolderList view. This class should
diff --git a/src/app/lists/folder-list/folder-list.component.ts b/src/app/lists/folder-list/folder-list.component.ts
index 7e0c344e5..f9eddd7ec 100644
--- a/src/app/lists/folder-list/folder-list.component.ts
+++ b/src/app/lists/folder-list/folder-list.component.ts
@@ -5,7 +5,7 @@ import { MatTable } from '@angular/material/table';
 
 import { FolderListDataSource } from './folder-list-datasource';
 import Folder from '../../folder';
-import { SystemConfigService } from '../../system-config.service';
+import { SystemConfigService } from '../../services/system-config.service';
 import { dataTableElevation } from '../../style';
 import { Subject } from 'rxjs';
 
diff --git a/src/app/cookie.service.spec.ts b/src/app/services/cookie.service.spec.ts
similarity index 100%
rename from src/app/cookie.service.spec.ts
rename to src/app/services/cookie.service.spec.ts
diff --git a/src/app/cookie.service.ts b/src/app/services/cookie.service.ts
similarity index 100%
rename from src/app/cookie.service.ts
rename to src/app/services/cookie.service.ts
diff --git a/src/app/db-status.service.spec.ts b/src/app/services/db-status.service.spec.ts
similarity index 100%
rename from src/app/db-status.service.spec.ts
rename to src/app/services/db-status.service.spec.ts
diff --git a/src/app/db-status.service.ts b/src/app/services/db-status.service.ts
similarity index 89%
rename from src/app/db-status.service.ts
rename to src/app/services/db-status.service.ts
index b1e2151ce..b3a076658 100644
--- a/src/app/db-status.service.ts
+++ b/src/app/services/db-status.service.ts
@@ -5,9 +5,9 @@ import { CookieService } from './cookie.service';
 import { Observable, of } from 'rxjs';
 import { map, retry, catchError } from 'rxjs/operators';
 
-import { environment } from '../environments/environment'
-import { apiURL, apiRetry } from './api-utils'
-import Folder from './folder'
+import { environment } from '../../environments/environment'
+import { apiURL, apiRetry } from '../api-utils'
+import Folder from '../folder'
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/device.service.spec.ts b/src/app/services/device.service.spec.ts
similarity index 100%
rename from src/app/device.service.spec.ts
rename to src/app/services/device.service.spec.ts
diff --git a/src/app/device.service.ts b/src/app/services/device.service.ts
similarity index 100%
rename from src/app/device.service.ts
rename to src/app/services/device.service.ts
diff --git a/src/app/folder.service.spec.ts b/src/app/services/folder.service.spec.ts
similarity index 100%
rename from src/app/folder.service.spec.ts
rename to src/app/services/folder.service.spec.ts
diff --git a/src/app/folder.service.ts b/src/app/services/folder.service.ts
similarity index 95%
rename from src/app/folder.service.ts
rename to src/app/services/folder.service.ts
index 8259c8432..8cfceb27b 100644
--- a/src/app/folder.service.ts
+++ b/src/app/services/folder.service.ts
@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { SystemConfigService } from './system-config.service';
 import { Observable, Subscriber } from 'rxjs';
-import { map } from 'rxjs/operators';
-import Folder from './folder';
+import Folder from '../folder';
 import { DbStatusService } from './db-status.service';
 
 @Injectable({
diff --git a/src/app/in-memory-config-data.service.spec.ts b/src/app/services/in-memory-config-data.service.spec.ts
similarity index 100%
rename from src/app/in-memory-config-data.service.spec.ts
rename to src/app/services/in-memory-config-data.service.spec.ts
diff --git a/src/app/in-memory-config-data.service.ts b/src/app/services/in-memory-config-data.service.ts
similarity index 67%
rename from src/app/in-memory-config-data.service.ts
rename to src/app/services/in-memory-config-data.service.ts
index eba1f726f..5e24e334c 100644
--- a/src/app/in-memory-config-data.service.ts
+++ b/src/app/services/in-memory-config-data.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { config } from './mocks/mock-config'
-import { dbStatus } from './mocks/mock-db-status'
+import { config } from '../mocks/mock-config'
+import { dbStatus } from '../mocks/mock-db-status'
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/request-cache.service.spec.ts b/src/app/services/request-cache.service.spec.ts
similarity index 100%
rename from src/app/request-cache.service.spec.ts
rename to src/app/services/request-cache.service.spec.ts
diff --git a/src/app/request-cache.service.ts b/src/app/services/request-cache.service.ts
similarity index 100%
rename from src/app/request-cache.service.ts
rename to src/app/services/request-cache.service.ts
diff --git a/src/app/system-config.service.spec.ts b/src/app/services/system-config.service.spec.ts
similarity index 100%
rename from src/app/system-config.service.spec.ts
rename to src/app/services/system-config.service.spec.ts
diff --git a/src/app/system-config.service.ts b/src/app/services/system-config.service.ts
similarity index 92%
rename from src/app/system-config.service.ts
rename to src/app/services/system-config.service.ts
index d045d95de..ba30657bf 100644
--- a/src/app/system-config.service.ts
+++ b/src/app/services/system-config.service.ts
@@ -4,11 +4,11 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable, Subject } from 'rxjs';
 import { map, retry } from 'rxjs/operators';
 
-import Folder from './folder';
-import { Device } from './device';
+import Folder from '../folder';
+import { Device } from '../device';
 import { CookieService } from './cookie.service';
-import { environment } from '../environments/environment'
-import { apiURL, apiRetry } from './api-utils'
+import { environment } from '../../environments/environment'
+import { apiURL, apiRetry } from '../api-utils'
 
 @Injectable({
   providedIn: 'root'