diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 750933cbd6b2648911323012f11af390cc0149bd..cc72673fa2fcf97a54856fddc62ad2d83885ba32 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 344a6562d14f931d8c211daded76d407e21a74ae..08a364e894701303dde0ddf798c7d311bff8758c 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 1fe732822c53f0626bd78f9ebd7cfe4dd040083c..c5b1c7a0791d932c2081b6fa21817abac3c8b8bf 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 e4a3d9fbba57f1714a41cf13e8ea7a74f39a55aa..0681b4a9d3d50d5a6c6e0cc817ea60515437d319 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 e05371e3e90b8ae790ac28cdec08f0810f1e8a78..fb5f0acf5c33d049fcf5ed69fc07140de6b66d83 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 d4c4f1bc76a1b2301dd5ff9508dba230b7663a58..157343596164bd173a53e977d430ddff3431ce50 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 9ba05072cde2e3f72f062034bc75a9b2a2c030fd..b86d5a587287c13c0fe57ba24c1b0997beb99e50 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 3cdf6e20de92b8ca3008b535c6373fd04e65194c..b1992c285fafd02704f6f55167edf1519d0c210e 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 84918dd0c1d6e12f3c8b55cdb61a3f62755dbb92..555e1d131f8b4a581ba1ec8a3d6208aedbdb9d2e 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 197360e389503d6ebde9d6fb934510052f8c1e0a..d55e34e4b321c2233ea253accfaaaa488bd80918 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 3a686b4a3da9a5774e5784c6d22432c328f50788..c7d68b61567fef8dcace5b49f8ab6baf6e520338 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 29240dce28104bf4a5b0cc3f3566e3a0b81a90b6..5755c1c262a4c573294d37904da90e28b97f141a 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 24f4c8c8aed5c18bc03b0379164f73590479d124..e9c5b96ef50a9cf6183e5a97fc7141a579d48178 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 5d0448a40d279eb8c89c6d31bdcbf6e9056ecc63..c66ef5c9b6918633b4414bb31c7c9f642f010f6b 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 bc09b4368c6da1419a29aec29d5703e01cde8de4..c7f3009842d54c34edb3d065267ed0fdb0e86aba 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 c19ce981f182af18b94265650d0bb1bde9afea42..63ba6e95de274090c7b73c3fe9fb6008dafb92ca 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 76928771f4ce6d26dab0ad3dbdefa4212b83fdc5..4a509e26a5852ee5677b8f83973d229c01bd895d 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 8e70fde71ff96201ca4482228cc849e643719827..015005c24551700dfb883892d27485479bab81c2 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 fb14451827c74082d432fba55f1b334fcbb4d180..9d989007e3d09fedb19bd4167b84d5630d3ed09f 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 6539576316743fcf2481e75dd04856712470d9bc..4b1460bcf897aa14634887fb09ed34ef1f2a75c2 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 bae2772508952aadf931e022a950be7e29b121d5..63976c72f2cd178a02294f8924d470375fde9f81 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 b77f30a77cb4d376d16d9c4cdfde5b478f32bf07..0bb2a6a9d5019f782b733056ccd9cdbd9ab58029 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 1d980c4e95b2ad67994567e56fb265c5ea646533..337de30d1422cb58cbe0dfa6a13dc075b222c156 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 c3e605b4006a9aab129f11520e4e86a07c8f6c38..de29ffdbae4aa34fb6924029c6d766590f7c744c 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 28db8c95edc448816003f67af2f79de994855cf5..caf2bcdc5f03dbdfc6b55c922810bc222897f3b2 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 0c87d6f218172aafdc5bbaeb573403a69cf74adb..229af7225d6bbf1eb0c8f9f3bb779829d2fb17bf 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 eb7153cb2ee8556ab076f362e5e90b10e1e0ff79..ae9da1f9039a5a18dc93e089d8945000c272a33f 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';