From dacb7605d6a47ab1c4765de826121de32bc31a10 Mon Sep 17 00:00:00 2001
From: Lukas Kimpel <lukas.kimpel@mni.thm.de>
Date: Tue, 20 Mar 2018 14:32:04 +0100
Subject: [PATCH] Move models in specific folders

---
 src/app/app-routing.module.ts                             | 2 +-
 src/app/authentication.service.ts                         | 6 +++---
 src/app/comment.service.ts                                | 2 +-
 .../dialogs/room-creation/room-creation.component.ts      | 2 +-
 .../dialogs/room-deletion/room-deletion.component.ts      | 2 +-
 .../room-modification/room-modification.component.ts      | 2 +-
 .../answer-statistics/answer-statistics.component.ts      | 8 ++++----
 .../fragments/comment-list/comment-list.component.ts      | 6 +++---
 .../content-answers-list.component.ts                     | 2 +-
 .../fragments/content-list/content-list.component.ts      | 2 +-
 .../creator-choice-content.component.ts                   | 4 ++--
 .../components/fragments/join-room/join-room.component.ts | 2 +-
 src/app/components/fragments/login/login.component.ts     | 6 +++---
 .../participant-choice-content.component.ts               | 4 ++--
 .../participant-text-content.component.ts                 | 4 ++--
 .../components/fragments/room-list/room-list.component.ts | 4 ++--
 .../pages/content-detail/content-detail.component.ts      | 2 +-
 .../pages/create-comment/create-comment.component.ts      | 6 +++---
 .../pages/creator-room/creator-room.component.ts          | 2 +-
 .../participant-content-carousel-page.component.ts        | 4 ++--
 .../pages/participant-room/participant-room.component.ts  | 2 +-
 src/app/components/pages/room/room.component.ts           | 2 +-
 src/app/content-answer.service.ts                         | 2 +-
 src/app/content.service.ts                                | 2 +-
 src/app/guards/authentication.guard.ts                    | 4 ++--
 src/app/in-memory-data.service.ts                         | 2 +-
 src/app/{ => models}/answer-option.ts                     | 0
 src/app/{ => models}/answer-text.ts                       | 0
 src/app/{ => models}/auth-provider.ts                     | 0
 src/app/{ => models}/choice-answer.ts                     | 0
 src/app/{ => models}/choice-content.ts                    | 0
 src/app/{ => models}/client-authentication.ts             | 0
 src/app/{ => models}/comment.ts                           | 0
 src/app/{ => models}/content-type.ts                      | 0
 src/app/{ => models}/content.ts                           | 0
 src/app/{ => models}/room.ts                              | 0
 src/app/{ => models}/text-content.ts                      | 0
 src/app/{ => models}/user-roles.enum.ts                   | 0
 src/app/{ => models}/user.ts                              | 0
 src/app/room.service.ts                                   | 2 +-
 40 files changed, 44 insertions(+), 44 deletions(-)
 rename src/app/{ => models}/answer-option.ts (100%)
 rename src/app/{ => models}/answer-text.ts (100%)
 rename src/app/{ => models}/auth-provider.ts (100%)
 rename src/app/{ => models}/choice-answer.ts (100%)
 rename src/app/{ => models}/choice-content.ts (100%)
 rename src/app/{ => models}/client-authentication.ts (100%)
 rename src/app/{ => models}/comment.ts (100%)
 rename src/app/{ => models}/content-type.ts (100%)
 rename src/app/{ => models}/content.ts (100%)
 rename src/app/{ => models}/room.ts (100%)
 rename src/app/{ => models}/text-content.ts (100%)
 rename src/app/{ => models}/user-roles.enum.ts (100%)
 rename src/app/{ => models}/user.ts (100%)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 750933cbd..cc72673fa 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -6,7 +6,7 @@ import { CreatorHomeScreenComponent } from './components/pages/creator-home-scre
 import { CreateCommentComponent } from './components/pages/create-comment/create-comment.component';
 import { ParticipantHomeScreenComponent } from './components/pages/participant-home-screen/participant-home-screen.component';
 import { AuthenticationGuard } from './guards/authentication.guard';
-import { UserRole } from './user-roles.enum';
+import { UserRole } from './models/user-roles.enum';
 import { ParticipantRoomComponent } from './components/pages/participant-room/participant-room.component';
 import { CreatorRoomComponent } from './components/pages/creator-room/creator-room.component';
 import { CommentListComponent } from './components/fragments/comment-list/comment-list.component';
diff --git a/src/app/authentication.service.ts b/src/app/authentication.service.ts
index 344a6562d..08a364e89 100644
--- a/src/app/authentication.service.ts
+++ b/src/app/authentication.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
-import { User } from './user';
+import { User } from './models/user';
 import { Observable } from 'rxjs/Observable';
 import { of } from 'rxjs/observable/of';
-import { UserRole } from './user-roles.enum';
+import { UserRole } from './models/user-roles.enum';
 import { DataStoreService } from './data-store.service';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { ClientAuthentication } from './client-authentication';
+import { ClientAuthentication } from './models/client-authentication';
 
 @Injectable()
 export class AuthenticationService {
diff --git a/src/app/comment.service.ts b/src/app/comment.service.ts
index 1fe732822..c5b1c7a07 100644
--- a/src/app/comment.service.ts
+++ b/src/app/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 './comment';
+import { Comment } from './models/comment';
 import { catchError, tap } from 'rxjs/operators';
 import { BaseHttpService } from './base-http.service';
 
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 e4a3d9fbb..0681b4a9d 100644
--- a/src/app/components/dialogs/room-creation/room-creation.component.ts
+++ b/src/app/components/dialogs/room-creation/room-creation.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { RoomService } from '../../../room.service';
-import { Room } from '../../../room';
+import { Room } from '../../../models/room';
 import { Router } from '@angular/router';
 import { NotificationService } from '../../../notification.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
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 e05371e3e..fb5f0acf5 100644
--- a/src/app/components/dialogs/room-deletion/room-deletion.component.ts
+++ b/src/app/components/dialogs/room-deletion/room-deletion.component.ts
@@ -4,7 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { NotificationService } from '../../../notification.service';
 import { RoomCreationComponent } from '../room-creation/room-creation.component';
 import { RoomService } from '../../../room.service';
-import { Room } from '../../../room';
+import { Room } from '../../../models/room';
 
 @Component({
   selector: 'app-room-deletion',
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 d4c4f1bc7..157343596 100644
--- a/src/app/components/dialogs/room-modification/room-modification.component.ts
+++ b/src/app/components/dialogs/room-modification/room-modification.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { Room } from '../../../room';
+import { Room } from '../../../models/room';
 import { RoomService } from '../../../room.service';
 import { RoomCreationComponent } from '../room-creation/room-creation.component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
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 9ba05072c..b86d5a587 100644
--- a/src/app/components/fragments/answer-statistics/answer-statistics.component.ts
+++ b/src/app/components/fragments/answer-statistics/answer-statistics.component.ts
@@ -1,12 +1,12 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { RoomService } from '../../../room.service';
-import { Content } from '../../../content';
+import { Content } from '../../../models/content';
 import { ContentService } from '../../../content.service';
 import { ContentAnswerService } from '../../../content-answer.service';
-import { AnswerText } from '../../../answer-text';
-import { ChoiceAnswer } from '../../../choice-answer';
-import { ContentType } from '../../../content-type';
+import { AnswerText } from '../../../models/answer-text';
+import { ChoiceAnswer } from '../../../models/choice-answer';
+import { ContentType } from '../../../models/content-type';
 
 @Component({
   selector: 'app-answer-statistics',
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 3cdf6e20d..b1992c285 100644
--- a/src/app/components/fragments/comment-list/comment-list.component.ts
+++ b/src/app/components/fragments/comment-list/comment-list.component.ts
@@ -1,13 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
-import { Comment } from '../../../comment';
+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 { UserRole } from '../../../user-roles.enum';
-import { User } from '../../../user';
+import { UserRole } from '../../../models/user-roles.enum';
+import { User } from '../../../models/user';
 
 @Component({
   selector: 'app-comment-list',
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 84918dd0c..555e1d131 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,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ContentAnswerService } from '../../../content-answer.service';
-import { AnswerText } from '../../../answer-text';
+import { AnswerText } from '../../../models/answer-text';
 import { ActivatedRoute } from '@angular/router';
 import { ContentService } from '../../../content.service';
 
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 197360e38..d55e34e4b 100644
--- a/src/app/components/fragments/content-list/content-list.component.ts
+++ b/src/app/components/fragments/content-list/content-list.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ContentService } from '../../../content.service';
-import { Content } from '../../../content';
+import { Content } from '../../../models/content';
 import { ActivatedRoute } from '@angular/router';
 
 @Component({
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 3a686b4a3..c7d68b615 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,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { AnswerOption } from '../../../answer-option';
-import { ChoiceContent } from '../../../choice-content';
+import { AnswerOption } from '../../../models/answer-option';
+import { ChoiceContent } from '../../../models/choice-content';
 import { ContentService } from '../../../content.service';
 
 export class DisplayAnswer {
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 29240dce2..5755c1c26 100644
--- a/src/app/components/fragments/join-room/join-room.component.ts
+++ b/src/app/components/fragments/join-room/join-room.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Room } from '../../../room';
+import { Room } from '../../../models/room';
 import { RoomService } from '../../../room.service';
 import { Router } from '@angular/router';
 import { RegisterErrorStateMatcher } from '../../dialogs/register/register.component';
diff --git a/src/app/components/fragments/login/login.component.ts b/src/app/components/fragments/login/login.component.ts
index 24f4c8c8a..e9c5b96ef 100644
--- a/src/app/components/fragments/login/login.component.ts
+++ b/src/app/components/fragments/login/login.component.ts
@@ -4,9 +4,9 @@ import { Router } from '@angular/router';
 import { NotificationService } from '../../../notification.service';
 import { ErrorStateMatcher } from '@angular/material';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
-import { UserRole } from '../../../user-roles.enum';
-import { ClientAuthentication } from '../../../client-authentication';
-import { User } from '../../../user';
+import { UserRole } from '../../../models/user-roles.enum';
+import { ClientAuthentication } from '../../../models/client-authentication';
+import { User } from '../../../models/user';
 
 export class LoginErrorStateMatcher implements ErrorStateMatcher {
   isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
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 5d0448a40..c66ef5c9b 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,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { ChoiceContent } from '../../../choice-content';
-import { AnswerOption } from '../../../answer-option';
+import { ChoiceContent } from '../../../models/choice-content';
+import { AnswerOption } from '../../../models/answer-option';
 import { ContentAnswerService } from '../../../content-answer.service';
 
 class CheckedAnswer {
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 bc09b4368..c7f300984 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,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { TextContent } from '../../../text-content';
+import { TextContent } from '../../../models/text-content';
 import { ContentAnswerService } from '../../../content-answer.service';
-import { AnswerText } from '../../../answer-text';
+import { AnswerText } from '../../../models/answer-text';
 
 @Component({
   selector: 'app-participant-text-content',
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 c19ce981f..63ba6e95d 100644
--- a/src/app/components/fragments/room-list/room-list.component.ts
+++ b/src/app/components/fragments/room-list/room-list.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
-import { Room } from '../../../room';
+import { Room } from '../../../models/room';
 import { RoomService } from '../../../room.service';
 import { AuthenticationService } from '../../../authentication.service';
-import { UserRole } from '../../../user-roles.enum';
+import { UserRole } from '../../../models/user-roles.enum';
 
 @Component({
   selector: 'app-room-list',
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 76928771f..4a509e26a 100644
--- a/src/app/components/pages/content-detail/content-detail.component.ts
+++ b/src/app/components/pages/content-detail/content-detail.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Content } from '../../../content';
+import { Content } from '../../../models/content';
 import { ContentService } from '../../../content.service';
 import { ActivatedRoute } from '@angular/router';
 
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 8e70fde71..015005c24 100644
--- a/src/app/components/pages/create-comment/create-comment.component.ts
+++ b/src/app/components/pages/create-comment/create-comment.component.ts
@@ -1,13 +1,13 @@
 import { Component, OnInit, Input, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
-import { Room } from '../../../room';
-import { Comment } from '../../../comment';
+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 { User } from '../../../user';
+import { User } from '../../../models/user';
 import { CommentListComponent } from '../../fragments/comment-list/comment-list.component';
 
 @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 fb1445182..9d989007e 100644
--- a/src/app/components/pages/creator-room/creator-room.component.ts
+++ b/src/app/components/pages/creator-room/creator-room.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { RoomService } from '../../../room.service';
 import { ActivatedRoute } from '@angular/router';
 import { RoomComponent } from '../room/room.component';
-import { Room } from '../../../room';
+import { Room } from '../../../models/room';
 import { Location } from '@angular/common';
 import { NotificationService } from '../../../notification.service';
 import { MatDialog } from '@angular/material';
diff --git a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts b/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
index 653957631..4b1460bcf 100644
--- a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
+++ b/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Content } from '../../../content';
-import { ContentType } from '../../../content-type';
+import { Content } from '../../../models/content';
+import { ContentType } from '../../../models/content-type';
 
 @Component({
   selector: 'app-participant-content-carousel-page',
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 bae277250..63976c72f 100644
--- a/src/app/components/pages/participant-room/participant-room.component.ts
+++ b/src/app/components/pages/participant-room/participant-room.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Room } from '../../../room';
+import { Room } from '../../../models/room';
 import { Location } from '@angular/common';
 import { RoomService } from '../../../room.service';
 import { ActivatedRoute } from '@angular/router';
diff --git a/src/app/components/pages/room/room.component.ts b/src/app/components/pages/room/room.component.ts
index b77f30a77..0bb2a6a9d 100644
--- a/src/app/components/pages/room/room.component.ts
+++ b/src/app/components/pages/room/room.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Room } from '../../../room';
+import { Room } from '../../../models/room';
 import { RoomService } from '../../../room.service';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
diff --git a/src/app/content-answer.service.ts b/src/app/content-answer.service.ts
index 1d980c4e9..337de30d1 100644
--- a/src/app/content-answer.service.ts
+++ b/src/app/content-answer.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { AnswerText } from './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.ts b/src/app/content.service.ts
index c3e605b40..de29ffdba 100644
--- a/src/app/content.service.ts
+++ b/src/app/content.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Content } from './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/guards/authentication.guard.ts b/src/app/guards/authentication.guard.ts
index 28db8c95e..caf2bcdc5 100644
--- a/src/app/guards/authentication.guard.ts
+++ b/src/app/guards/authentication.guard.ts
@@ -5,8 +5,8 @@ import 'rxjs/add/operator/map';
 import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/catch';
 import { NotificationService } from '../notification.service';
-import { UserRole } from '../user-roles.enum';
-import { User } from '../user';
+import { UserRole } from '../models/user-roles.enum';
+import { User } from '../models/user';
 
 @Injectable()
 export class AuthenticationGuard implements CanActivate {
diff --git a/src/app/in-memory-data.service.ts b/src/app/in-memory-data.service.ts
index 0c87d6f21..229af7225 100644
--- a/src/app/in-memory-data.service.ts
+++ b/src/app/in-memory-data.service.ts
@@ -1,5 +1,5 @@
 import { InMemoryDbService } from 'angular-in-memory-web-api';
-import { ContentType } from './content-type';
+import { ContentType } from './models/content-type';
 
 export class InMemoryDataService implements InMemoryDbService {
   /**
diff --git a/src/app/answer-option.ts b/src/app/models/answer-option.ts
similarity index 100%
rename from src/app/answer-option.ts
rename to src/app/models/answer-option.ts
diff --git a/src/app/answer-text.ts b/src/app/models/answer-text.ts
similarity index 100%
rename from src/app/answer-text.ts
rename to src/app/models/answer-text.ts
diff --git a/src/app/auth-provider.ts b/src/app/models/auth-provider.ts
similarity index 100%
rename from src/app/auth-provider.ts
rename to src/app/models/auth-provider.ts
diff --git a/src/app/choice-answer.ts b/src/app/models/choice-answer.ts
similarity index 100%
rename from src/app/choice-answer.ts
rename to src/app/models/choice-answer.ts
diff --git a/src/app/choice-content.ts b/src/app/models/choice-content.ts
similarity index 100%
rename from src/app/choice-content.ts
rename to src/app/models/choice-content.ts
diff --git a/src/app/client-authentication.ts b/src/app/models/client-authentication.ts
similarity index 100%
rename from src/app/client-authentication.ts
rename to src/app/models/client-authentication.ts
diff --git a/src/app/comment.ts b/src/app/models/comment.ts
similarity index 100%
rename from src/app/comment.ts
rename to src/app/models/comment.ts
diff --git a/src/app/content-type.ts b/src/app/models/content-type.ts
similarity index 100%
rename from src/app/content-type.ts
rename to src/app/models/content-type.ts
diff --git a/src/app/content.ts b/src/app/models/content.ts
similarity index 100%
rename from src/app/content.ts
rename to src/app/models/content.ts
diff --git a/src/app/room.ts b/src/app/models/room.ts
similarity index 100%
rename from src/app/room.ts
rename to src/app/models/room.ts
diff --git a/src/app/text-content.ts b/src/app/models/text-content.ts
similarity index 100%
rename from src/app/text-content.ts
rename to src/app/models/text-content.ts
diff --git a/src/app/user-roles.enum.ts b/src/app/models/user-roles.enum.ts
similarity index 100%
rename from src/app/user-roles.enum.ts
rename to src/app/models/user-roles.enum.ts
diff --git a/src/app/user.ts b/src/app/models/user.ts
similarity index 100%
rename from src/app/user.ts
rename to src/app/models/user.ts
diff --git a/src/app/room.service.ts b/src/app/room.service.ts
index eb7153cb2..ae9da1f90 100644
--- a/src/app/room.service.ts
+++ b/src/app/room.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Room } from './room';
+import { Room } from './models/room';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { catchError, tap } from 'rxjs/operators';
-- 
GitLab