diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6a8fb68505baf1b627b25319191889505d188233..89cfdec93768a0a3cd0bc6a520562541bf3c599e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -52,24 +52,24 @@ import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { RoomComponent } from './components/pages/room/room.component';
 import { RoomCreationComponent } from './components/dialogs/room-creation/room-creation.component';
 import { LoginScreenComponent } from './components/pages/login-screen/login-screen.component';
-import { NotificationService } from './notification.service';
-import { AuthenticationService } from './authentication.service';
+import { NotificationService } from './services/util/notification.service';
+import { AuthenticationService } from './services/http/authentication.service';
 import { AuthenticationGuard } from './guards/authentication.guard';
 import { ContentCreationComponent } from './content-creation/content-creation.component';
-import { RoomService } from './room.service';
+import { RoomService } from './services/http/room.service';
 import { RoomListComponent } from './components/fragments/room-list/room-list.component';
 import { CreatorHomeScreenComponent } from './components/pages/creator-home-screen/creator-home-screen.component';
 import { CreateCommentComponent } from './components/pages/create-comment/create-comment.component';
-import { CommentService } from './comment.service';
+import { CommentService } from './services/http/comment.service';
 import { ParticipantHomeScreenComponent } from './components/pages/participant-home-screen/participant-home-screen.component';
 import { ParticipantRoomComponent } from './components/pages/participant-room/participant-room.component';
-import { DataStoreService } from './data-store.service';
+import { DataStoreService } from './services/util/data-store.service';
 import { CreatorRoomComponent } from './components/pages/creator-room/creator-room.component';
 import { ContentDetailComponent } from './components/pages/content-detail/content-detail.component';
 import { ContentListComponent } from './components/fragments/content-list/content-list.component';
-import { ContentService } from './content.service';
+import { ContentService } from './services/http/content.service';
 import { ContentAnswersListComponent } from './components/fragments/content-answers-list/content-answers-list.component';
-import { ContentAnswerService } from './content-answer.service';
+import { ContentAnswerService } from './services/http/content-answer.service';
 import { RoomDeletionComponent } from './components/dialogs/room-deletion/room-deletion.component';
 import { AnswerStatisticsComponent } from './components/fragments/answer-statistics/answer-statistics.component';
 import { RoomModificationComponent } from './components/dialogs/room-modification/room-modification.component';
diff --git a/src/app/components/dialogs/room-creation/room-creation.component.ts b/src/app/components/dialogs/room-creation/room-creation.component.ts
index 0681b4a9d3d50d5a6c6e0cc817ea60515437d319..ed6e6d7ebd8f47bcb1bd2dedc23b94aaf67e88d4 100644
--- a/src/app/components/dialogs/room-creation/room-creation.component.ts
+++ b/src/app/components/dialogs/room-creation/room-creation.component.ts
@@ -1,8 +1,8 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { RoomService } from '../../../room.service';
+import { RoomService } from '../../../services/http/room.service';
 import { Room } from '../../../models/room';
 import { Router } from '@angular/router';
-import { NotificationService } from '../../../notification.service';
+import { NotificationService } from '../../../services/util/notification.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 
 @Component({
diff --git a/src/app/components/dialogs/room-deletion/room-deletion.component.ts b/src/app/components/dialogs/room-deletion/room-deletion.component.ts
index fb5f0acf5c33d049fcf5ed69fc07140de6b66d83..1ab0000f3b435f1729a543aefa936a0611a0a58b 100644
--- a/src/app/components/dialogs/room-deletion/room-deletion.component.ts
+++ b/src/app/components/dialogs/room-deletion/room-deletion.component.ts
@@ -1,9 +1,9 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
-import { NotificationService } from '../../../notification.service';
+import { NotificationService } from '../../../services/util/notification.service';
 import { RoomCreationComponent } from '../room-creation/room-creation.component';
-import { RoomService } from '../../../room.service';
+import { RoomService } from '../../../services/http/room.service';
 import { Room } from '../../../models/room';
 
 @Component({
diff --git a/src/app/components/dialogs/room-modification/room-modification.component.ts b/src/app/components/dialogs/room-modification/room-modification.component.ts
index 157343596164bd173a53e977d430ddff3431ce50..8deacaa1ab00fd188246041f2dd5d5972d670905 100644
--- a/src/app/components/dialogs/room-modification/room-modification.component.ts
+++ b/src/app/components/dialogs/room-modification/room-modification.component.ts
@@ -1,9 +1,9 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Room } from '../../../models/room';
-import { RoomService } from '../../../room.service';
+import { RoomService } from '../../../services/http/room.service';
 import { RoomCreationComponent } from '../room-creation/room-creation.component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
-import { NotificationService } from '../../../notification.service';
+import { NotificationService } from '../../../services/util/notification.service';
 import { Router } from '@angular/router';
 
 @Component({
diff --git a/src/app/components/fragments/answer-statistics/answer-statistics.component.ts b/src/app/components/fragments/answer-statistics/answer-statistics.component.ts
index b86d5a587287c13c0fe57ba24c1b0997beb99e50..b3da346841975fde0e8082baf1815b10e8e2db07 100644
--- a/src/app/components/fragments/answer-statistics/answer-statistics.component.ts
+++ b/src/app/components/fragments/answer-statistics/answer-statistics.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { RoomService } from '../../../room.service';
+import { RoomService } from '../../../services/http/room.service';
 import { Content } from '../../../models/content';
-import { ContentService } from '../../../content.service';
-import { ContentAnswerService } from '../../../content-answer.service';
+import { ContentService } from '../../../services/http/content.service';
+import { ContentAnswerService } from '../../../services/http/content-answer.service';
 import { AnswerText } from '../../../models/answer-text';
 import { ChoiceAnswer } from '../../../models/choice-answer';
 import { ContentType } from '../../../models/content-type';
diff --git a/src/app/components/fragments/comment-list/comment-list.component.ts b/src/app/components/fragments/comment-list/comment-list.component.ts
index b1992c285fafd02704f6f55167edf1519d0c210e..ff2e3707ab4cd40a9af081f1f11b5277aff842f7 100644
--- a/src/app/components/fragments/comment-list/comment-list.component.ts
+++ b/src/app/components/fragments/comment-list/comment-list.component.ts
@@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 import { Comment } from '../../../models/comment';
-import { CommentService } from '../../../comment.service';
-import { RoomService } from '../../../room.service';
-import { NotificationService } from '../../../notification.service';
-import { AuthenticationService } from '../../../authentication.service';
+import { CommentService } from '../../../services/http/comment.service';
+import { RoomService } from '../../../services/http/room.service';
+import { NotificationService } from '../../../services/util/notification.service';
+import { AuthenticationService } from '../../../services/http/authentication.service';
 import { UserRole } from '../../../models/user-roles.enum';
 import { User } from '../../../models/user';
 
diff --git a/src/app/components/fragments/content-answers-list/content-answers-list.component.ts b/src/app/components/fragments/content-answers-list/content-answers-list.component.ts
index 555e1d131f8b4a581ba1ec8a3d6208aedbdb9d2e..565a83aca32e22f9292f802f17b5061e643c5319 100644
--- a/src/app/components/fragments/content-answers-list/content-answers-list.component.ts
+++ b/src/app/components/fragments/content-answers-list/content-answers-list.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
-import { ContentAnswerService } from '../../../content-answer.service';
+import { ContentAnswerService } from '../../../services/http/content-answer.service';
 import { AnswerText } from '../../../models/answer-text';
 import { ActivatedRoute } from '@angular/router';
-import { ContentService } from '../../../content.service';
+import { ContentService } from '../../../services/http/content.service';
 
 @Component({
   selector: 'app-content-answers-list',
diff --git a/src/app/components/fragments/content-list/content-list.component.ts b/src/app/components/fragments/content-list/content-list.component.ts
index d55e34e4b321c2233ea253accfaaaa488bd80918..b209b36a5e5a447c43d3af38f38891282e1f0013 100644
--- a/src/app/components/fragments/content-list/content-list.component.ts
+++ b/src/app/components/fragments/content-list/content-list.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ContentService } from '../../../content.service';
+import { ContentService } from '../../../services/http/content.service';
 import { Content } from '../../../models/content';
 import { ActivatedRoute } from '@angular/router';
 
diff --git a/src/app/components/fragments/creator-choice-content/creator-choice-content.component.ts b/src/app/components/fragments/creator-choice-content/creator-choice-content.component.ts
index c7d68b61567fef8dcace5b49f8ab6baf6e520338..1bc3ae6ac722564df7c5eba982a8b87583da1b41 100644
--- a/src/app/components/fragments/creator-choice-content/creator-choice-content.component.ts
+++ b/src/app/components/fragments/creator-choice-content/creator-choice-content.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { AnswerOption } from '../../../models/answer-option';
 import { ChoiceContent } from '../../../models/choice-content';
-import { ContentService } from '../../../content.service';
+import { ContentService } from '../../../services/http/content.service';
 
 export class DisplayAnswer {
   answerOption: AnswerOption;
diff --git a/src/app/components/fragments/join-room/join-room.component.ts b/src/app/components/fragments/join-room/join-room.component.ts
index 5755c1c262a4c573294d37904da90e28b97f141a..e6bf940123ed4b4bae61135fc589a3d74818f5bf 100644
--- a/src/app/components/fragments/join-room/join-room.component.ts
+++ b/src/app/components/fragments/join-room/join-room.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { Room } from '../../../models/room';
-import { RoomService } from '../../../room.service';
+import { RoomService } from '../../../services/http/room.service';
 import { Router } from '@angular/router';
 import { RegisterErrorStateMatcher } from '../../dialogs/register/register.component';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { ErrorStateMatcher } from '@angular/material';
-import { NotificationService } from '../../../notification.service';
+import { NotificationService } from '../../../services/util/notification.service';
 
 export class JoinErrorStateMatcher implements ErrorStateMatcher {
   isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
diff --git a/src/app/components/fragments/login/login.component.ts b/src/app/components/fragments/login/login.component.ts
index e9c5b96ef50a9cf6183e5a97fc7141a579d48178..3da0a3bed4e3abbdc6b3d0c3e4d25a82b714998c 100644
--- a/src/app/components/fragments/login/login.component.ts
+++ b/src/app/components/fragments/login/login.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { AuthenticationService } from '../../../authentication.service';
+import { AuthenticationService } from '../../../services/http/authentication.service';
 import { Router } from '@angular/router';
-import { NotificationService } from '../../../notification.service';
+import { NotificationService } from '../../../services/util/notification.service';
 import { ErrorStateMatcher } from '@angular/material';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { UserRole } from '../../../models/user-roles.enum';
diff --git a/src/app/components/fragments/participant-choice-content/participant-choice-content.component.ts b/src/app/components/fragments/participant-choice-content/participant-choice-content.component.ts
index c66ef5c9b6918633b4414bb31c7c9f642f010f6b..9d84b0f4a353eb00d348011ce307c0e894f87c5e 100644
--- a/src/app/components/fragments/participant-choice-content/participant-choice-content.component.ts
+++ b/src/app/components/fragments/participant-choice-content/participant-choice-content.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ChoiceContent } from '../../../models/choice-content';
 import { AnswerOption } from '../../../models/answer-option';
-import { ContentAnswerService } from '../../../content-answer.service';
+import { ContentAnswerService } from '../../../services/http/content-answer.service';
 
 class CheckedAnswer {
   answerOption: AnswerOption;
diff --git a/src/app/components/fragments/participant-text-content/participant-text-content.component.ts b/src/app/components/fragments/participant-text-content/participant-text-content.component.ts
index c7f3009842d54c34edb3d065267ed0fdb0e86aba..793191db7cd1d00eea88e2cb998dfd8beeb1e596 100644
--- a/src/app/components/fragments/participant-text-content/participant-text-content.component.ts
+++ b/src/app/components/fragments/participant-text-content/participant-text-content.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { TextContent } from '../../../models/text-content';
-import { ContentAnswerService } from '../../../content-answer.service';
+import { ContentAnswerService } from '../../../services/http/content-answer.service';
 import { AnswerText } from '../../../models/answer-text';
 
 @Component({
diff --git a/src/app/components/fragments/room-list/room-list.component.ts b/src/app/components/fragments/room-list/room-list.component.ts
index 63ba6e95de274090c7b73c3fe9fb6008dafb92ca..0085157249b74dd8f449f6a0a460f4281bb54575 100644
--- a/src/app/components/fragments/room-list/room-list.component.ts
+++ b/src/app/components/fragments/room-list/room-list.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Room } from '../../../models/room';
-import { RoomService } from '../../../room.service';
-import { AuthenticationService } from '../../../authentication.service';
+import { RoomService } from '../../../services/http/room.service';
+import { AuthenticationService } from '../../../services/http/authentication.service';
 import { UserRole } from '../../../models/user-roles.enum';
 
 @Component({
diff --git a/src/app/components/pages/content-detail/content-detail.component.ts b/src/app/components/pages/content-detail/content-detail.component.ts
index 4a509e26a5852ee5677b8f83973d229c01bd895d..966d225a34b20008d2ef5c11aac218b20dc1155a 100644
--- a/src/app/components/pages/content-detail/content-detail.component.ts
+++ b/src/app/components/pages/content-detail/content-detail.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Content } from '../../../models/content';
-import { ContentService } from '../../../content.service';
+import { ContentService } from '../../../services/http/content.service';
 import { ActivatedRoute } from '@angular/router';
 
 @Component({
diff --git a/src/app/components/pages/create-comment/create-comment.component.ts b/src/app/components/pages/create-comment/create-comment.component.ts
index 015005c24551700dfb883892d27485479bab81c2..a16daeccea51abe9a923c5e583ef145bd9255a93 100644
--- a/src/app/components/pages/create-comment/create-comment.component.ts
+++ b/src/app/components/pages/create-comment/create-comment.component.ts
@@ -3,10 +3,10 @@ import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 import { Room } from '../../../models/room';
 import { Comment } from '../../../models/comment';
-import { RoomService } from '../../../room.service';
-import { CommentService } from '../../../comment.service';
-import { NotificationService } from '../../../notification.service';
-import { AuthenticationService } from '../../../authentication.service';
+import { RoomService } from '../../../services/http/room.service';
+import { CommentService } from '../../../services/http/comment.service';
+import { NotificationService } from '../../../services/util/notification.service';
+import { AuthenticationService } from '../../../services/http/authentication.service';
 import { User } from '../../../models/user';
 import { CommentListComponent } from '../../fragments/comment-list/comment-list.component';
 
diff --git a/src/app/components/pages/creator-room/creator-room.component.ts b/src/app/components/pages/creator-room/creator-room.component.ts
index 9d989007e3d09fedb19bd4167b84d5630d3ed09f..20387e270cf39dab5508044ca4a09da4e4e6539e 100644
--- a/src/app/components/pages/creator-room/creator-room.component.ts
+++ b/src/app/components/pages/creator-room/creator-room.component.ts
@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
-import { RoomService } from '../../../room.service';
+import { RoomService } from '../../../services/http/room.service';
 import { ActivatedRoute } from '@angular/router';
 import { RoomComponent } from '../room/room.component';
 import { Room } from '../../../models/room';
 import { Location } from '@angular/common';
-import { NotificationService } from '../../../notification.service';
+import { NotificationService } from '../../../services/util/notification.service';
 import { MatDialog } from '@angular/material';
 import { ContentCreationComponent } from '../content-creation/content-creation.component';
 import { RoomDeletionComponent } from '../../dialogs/room-deletion/room-deletion.component';
diff --git a/src/app/components/pages/participant-room/participant-room.component.ts b/src/app/components/pages/participant-room/participant-room.component.ts
index 63976c72f2cd178a02294f8924d470375fde9f81..f095234ca0a0f121c4056e06df1011dbeeaed3a6 100644
--- a/src/app/components/pages/participant-room/participant-room.component.ts
+++ b/src/app/components/pages/participant-room/participant-room.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Room } from '../../../models/room';
 import { Location } from '@angular/common';
-import { RoomService } from '../../../room.service';
+import { RoomService } from '../../../services/http/room.service';
 import { ActivatedRoute } from '@angular/router';
 
 @Component({
diff --git a/src/app/components/pages/room/room.component.ts b/src/app/components/pages/room/room.component.ts
index 0bb2a6a9d5019f782b733056ccd9cdbd9ab58029..a876549a9d8b2b8d48b749052d95992f3c60c4b4 100644
--- a/src/app/components/pages/room/room.component.ts
+++ b/src/app/components/pages/room/room.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Room } from '../../../models/room';
-import { RoomService } from '../../../room.service';
+import { RoomService } from '../../../services/http/room.service';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 
diff --git a/src/app/guards/authentication.guard.ts b/src/app/guards/authentication.guard.ts
index caf2bcdc5f03dbdfc6b55c922810bc222897f3b2..4a1f4551a0d3194f0e8ae03c11a5d08aaaf6f755 100644
--- a/src/app/guards/authentication.guard.ts
+++ b/src/app/guards/authentication.guard.ts
@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
-import { AuthenticationService } from '../authentication.service';
+import { AuthenticationService } from '../services/http/authentication.service';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/catch';
-import { NotificationService } from '../notification.service';
+import { NotificationService } from '../services/util/notification.service';
 import { UserRole } from '../models/user-roles.enum';
 import { User } from '../models/user';
 
diff --git a/src/app/interceptors/authentication.interceptor.ts b/src/app/interceptors/authentication.interceptor.ts
index 7dae5fee761838923f22bfb0c83b3f548289b2f7..ce376312c59ccb0f2f3e2961540a276064ad8920 100644
--- a/src/app/interceptors/authentication.interceptor.ts
+++ b/src/app/interceptors/authentication.interceptor.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';
 import 'rxjs/add/operator/do';
-import { AuthenticationService } from '../authentication.service';
-import { NotificationService } from '../notification.service';
+import { AuthenticationService } from '../services/http/authentication.service';
+import { NotificationService } from '../services/util/notification.service';
 import { Router } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/app/authentication.service.spec.ts b/src/app/services/http/authentication.service.spec.ts
similarity index 100%
rename from src/app/authentication.service.spec.ts
rename to src/app/services/http/authentication.service.spec.ts
diff --git a/src/app/authentication.service.ts b/src/app/services/http/authentication.service.ts
similarity index 93%
rename from src/app/authentication.service.ts
rename to src/app/services/http/authentication.service.ts
index 08a364e894701303dde0ddf798c7d311bff8758c..456c6adececd39250c74ea05e75803014f6423c9 100644
--- a/src/app/authentication.service.ts
+++ b/src/app/services/http/authentication.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
-import { User } from './models/user';
+import { User } from '../../models/user';
 import { Observable } from 'rxjs/Observable';
 import { of } from 'rxjs/observable/of';
-import { UserRole } from './models/user-roles.enum';
-import { DataStoreService } from './data-store.service';
+import { UserRole } from '../../models/user-roles.enum';
+import { DataStoreService } from '../util/data-store.service';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { ClientAuthentication } from './models/client-authentication';
+import { ClientAuthentication } from '../../models/client-authentication';
 
 @Injectable()
 export class AuthenticationService {
diff --git a/src/app/base-http.service.spec.ts b/src/app/services/http/base-http.service.spec.ts
similarity index 100%
rename from src/app/base-http.service.spec.ts
rename to src/app/services/http/base-http.service.spec.ts
diff --git a/src/app/base-http.service.ts b/src/app/services/http/base-http.service.ts
similarity index 100%
rename from src/app/base-http.service.ts
rename to src/app/services/http/base-http.service.ts
diff --git a/src/app/comment.service.spec.ts b/src/app/services/http/comment.service.spec.ts
similarity index 100%
rename from src/app/comment.service.spec.ts
rename to src/app/services/http/comment.service.spec.ts
diff --git a/src/app/comment.service.ts b/src/app/services/http/comment.service.ts
similarity index 97%
rename from src/app/comment.service.ts
rename to src/app/services/http/comment.service.ts
index c5b1c7a0791d932c2081b6fa21817abac3c8b8bf..f46b26fbd3e89975f12bb53f63c14724f11446f6 100644
--- a/src/app/comment.service.ts
+++ b/src/app/services/http/comment.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
-import { Comment } from './models/comment';
+import { Comment } from '../../models/comment';
 import { catchError, tap } from 'rxjs/operators';
 import { BaseHttpService } from './base-http.service';
 
diff --git a/src/app/content-answer.service.spec.ts b/src/app/services/http/content-answer.service.spec.ts
similarity index 100%
rename from src/app/content-answer.service.spec.ts
rename to src/app/services/http/content-answer.service.spec.ts
diff --git a/src/app/content-answer.service.ts b/src/app/services/http/content-answer.service.ts
similarity index 96%
rename from src/app/content-answer.service.ts
rename to src/app/services/http/content-answer.service.ts
index 337de30d1422cb58cbe0dfa6a13dc075b222c156..67f55778b4ccdf0ebb41efa1ec5706b2b8e58285 100644
--- a/src/app/content-answer.service.ts
+++ b/src/app/services/http/content-answer.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { AnswerText } from './models/answer-text';
+import { AnswerText } from '../../models/answer-text';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { catchError, tap } from 'rxjs/operators';
diff --git a/src/app/content.service.spec.ts b/src/app/services/http/content.service.spec.ts
similarity index 100%
rename from src/app/content.service.spec.ts
rename to src/app/services/http/content.service.spec.ts
diff --git a/src/app/content.service.ts b/src/app/services/http/content.service.ts
similarity index 96%
rename from src/app/content.service.ts
rename to src/app/services/http/content.service.ts
index de29ffdbae4aa34fb6924029c6d766590f7c744c..f41febbc1cf34ecb7aaba57ea8db37ea1dc90b7c 100644
--- a/src/app/content.service.ts
+++ b/src/app/services/http/content.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Content } from './models/content';
+import { Content } from '../../models/content';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { catchError, tap } from 'rxjs/operators';
diff --git a/src/app/in-memory-data.service.ts b/src/app/services/http/in-memory-data.service.ts
similarity index 98%
rename from src/app/in-memory-data.service.ts
rename to src/app/services/http/in-memory-data.service.ts
index 229af7225d6bbf1eb0c8f9f3bb779829d2fb17bf..c68f6bba438c6f8534f388342f4018de470ca966 100644
--- a/src/app/in-memory-data.service.ts
+++ b/src/app/services/http/in-memory-data.service.ts
@@ -1,5 +1,5 @@
 import { InMemoryDbService } from 'angular-in-memory-web-api';
-import { ContentType } from './models/content-type';
+import { ContentType } from '../../models/content-type';
 
 export class InMemoryDataService implements InMemoryDbService {
   /**
diff --git a/src/app/room.service.spec.ts b/src/app/services/http/room.service.spec.ts
similarity index 100%
rename from src/app/room.service.spec.ts
rename to src/app/services/http/room.service.spec.ts
diff --git a/src/app/room.service.ts b/src/app/services/http/room.service.ts
similarity index 98%
rename from src/app/room.service.ts
rename to src/app/services/http/room.service.ts
index ae9da1f9039a5a18dc93e089d8945000c272a33f..02fa5ef702d7f967626f450d73299caeff84b92b 100644
--- a/src/app/room.service.ts
+++ b/src/app/services/http/room.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Room } from './models/room';
+import { Room } from '../../models/room';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { catchError, tap } from 'rxjs/operators';
diff --git a/src/app/data-store.service.spec.ts b/src/app/services/util/data-store.service.spec.ts
similarity index 100%
rename from src/app/data-store.service.spec.ts
rename to src/app/services/util/data-store.service.spec.ts
diff --git a/src/app/data-store.service.ts b/src/app/services/util/data-store.service.ts
similarity index 100%
rename from src/app/data-store.service.ts
rename to src/app/services/util/data-store.service.ts
diff --git a/src/app/notification.service.spec.ts b/src/app/services/util/notification.service.spec.ts
similarity index 100%
rename from src/app/notification.service.spec.ts
rename to src/app/services/util/notification.service.spec.ts
diff --git a/src/app/notification.service.ts b/src/app/services/util/notification.service.ts
similarity index 100%
rename from src/app/notification.service.ts
rename to src/app/services/util/notification.service.ts