From 5f67c491ecc8e53150333b393148f030d97b1aa4 Mon Sep 17 00:00:00 2001
From: Lukas Kimpel <lukas.kimpel@mni.thm.de>
Date: Tue, 20 Mar 2018 14:35:05 +0100
Subject: [PATCH] Move services in specific folders

---
 src/app/app.module.ts                              | 14 +++++++-------
 .../room-creation/room-creation.component.ts       |  4 ++--
 .../room-deletion/room-deletion.component.ts       |  4 ++--
 .../room-modification.component.ts                 |  4 ++--
 .../answer-statistics.component.ts                 |  6 +++---
 .../comment-list/comment-list.component.ts         |  8 ++++----
 .../content-answers-list.component.ts              |  4 ++--
 .../content-list/content-list.component.ts         |  2 +-
 .../creator-choice-content.component.ts            |  2 +-
 .../fragments/join-room/join-room.component.ts     |  4 ++--
 .../components/fragments/login/login.component.ts  |  4 ++--
 .../participant-choice-content.component.ts        |  2 +-
 .../participant-text-content.component.ts          |  2 +-
 .../fragments/room-list/room-list.component.ts     |  4 ++--
 .../content-detail/content-detail.component.ts     |  2 +-
 .../create-comment/create-comment.component.ts     |  8 ++++----
 .../pages/creator-room/creator-room.component.ts   |  4 ++--
 .../participant-room/participant-room.component.ts |  2 +-
 src/app/components/pages/room/room.component.ts    |  2 +-
 src/app/guards/authentication.guard.ts             |  4 ++--
 src/app/interceptors/authentication.interceptor.ts |  4 ++--
 .../http}/authentication.service.spec.ts           |  0
 .../{ => services/http}/authentication.service.ts  |  8 ++++----
 .../{ => services/http}/base-http.service.spec.ts  |  0
 src/app/{ => services/http}/base-http.service.ts   |  0
 .../{ => services/http}/comment.service.spec.ts    |  0
 src/app/{ => services/http}/comment.service.ts     |  2 +-
 .../http}/content-answer.service.spec.ts           |  0
 .../{ => services/http}/content-answer.service.ts  |  2 +-
 .../{ => services/http}/content.service.spec.ts    |  0
 src/app/{ => services/http}/content.service.ts     |  2 +-
 .../{ => services/http}/in-memory-data.service.ts  |  2 +-
 src/app/{ => services/http}/room.service.spec.ts   |  0
 src/app/{ => services/http}/room.service.ts        |  2 +-
 .../{ => services/util}/data-store.service.spec.ts |  0
 src/app/{ => services/util}/data-store.service.ts  |  0
 .../util}/notification.service.spec.ts             |  0
 .../{ => services/util}/notification.service.ts    |  0
 38 files changed, 54 insertions(+), 54 deletions(-)
 rename src/app/{ => services/http}/authentication.service.spec.ts (100%)
 rename src/app/{ => services/http}/authentication.service.ts (93%)
 rename src/app/{ => services/http}/base-http.service.spec.ts (100%)
 rename src/app/{ => services/http}/base-http.service.ts (100%)
 rename src/app/{ => services/http}/comment.service.spec.ts (100%)
 rename src/app/{ => services/http}/comment.service.ts (97%)
 rename src/app/{ => services/http}/content-answer.service.spec.ts (100%)
 rename src/app/{ => services/http}/content-answer.service.ts (96%)
 rename src/app/{ => services/http}/content.service.spec.ts (100%)
 rename src/app/{ => services/http}/content.service.ts (96%)
 rename src/app/{ => services/http}/in-memory-data.service.ts (98%)
 rename src/app/{ => services/http}/room.service.spec.ts (100%)
 rename src/app/{ => services/http}/room.service.ts (98%)
 rename src/app/{ => services/util}/data-store.service.spec.ts (100%)
 rename src/app/{ => services/util}/data-store.service.ts (100%)
 rename src/app/{ => services/util}/notification.service.spec.ts (100%)
 rename src/app/{ => services/util}/notification.service.ts (100%)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6a8fb6850..89cfdec93 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 0681b4a9d..ed6e6d7eb 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 fb5f0acf5..1ab0000f3 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 157343596..8deacaa1a 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 b86d5a587..b3da34684 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 b1992c285..ff2e3707a 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 555e1d131..565a83aca 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 d55e34e4b..b209b36a5 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 c7d68b615..1bc3ae6ac 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 5755c1c26..e6bf94012 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 e9c5b96ef..3da0a3bed 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 c66ef5c9b..9d84b0f4a 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 c7f300984..793191db7 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 63ba6e95d..008515724 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 4a509e26a..966d225a3 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 015005c24..a16daecce 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 9d989007e..20387e270 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 63976c72f..f095234ca 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 0bb2a6a9d..a876549a9 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 caf2bcdc5..4a1f4551a 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 7dae5fee7..ce376312c 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 08a364e89..456c6adec 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 c5b1c7a07..f46b26fbd 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 337de30d1..67f55778b 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 de29ffdba..f41febbc1 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 229af7225..c68f6bba4 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 ae9da1f90..02fa5ef70 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
-- 
GitLab