diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 9597fe202d4cf7ff688c15dc735e2e6114ede633..52f322a8ae91561bd3d81732b3186c201dba1bca 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -24,7 +24,7 @@ import { EssentialsModule } from './components/essentials/essentials.module';
 import { SharedModule } from './components/shared/shared.module';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { LanguageService } from './components/shared/LanguageService';
+import { LanguageService } from './services/util/language.service';
 import { MarkdownService, MarkedOptions } from 'ngx-markdown';
 export function dialogClose(dialogResult: any) {
 }
diff --git a/src/app/components/creator/content-create-page/content-create-page.component.ts b/src/app/components/creator/content-create-page/content-create-page.component.ts
index 3fd5e4aabe8e84ca149ff4fec090b053a82b88a4..291fea722c732bac2314e6e7c3688891bc61aa86 100644
--- a/src/app/components/creator/content-create-page/content-create-page.component.ts
+++ b/src/app/components/creator/content-create-page/content-create-page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { LanguageService } from '../../shared/LanguageService';
+import { LanguageService } from '../../../services/util/language.service';
 
 @Component({
   selector: 'app-content-create-page',
diff --git a/src/app/components/creator/home-creator-page/home-creator-page.component.ts b/src/app/components/creator/home-creator-page/home-creator-page.component.ts
index a3f2aef64d54034662b943a600582bf728ae99f3..deea222bb4e90c5f467b09fd666b20f7d9190e58 100644
--- a/src/app/components/creator/home-creator-page/home-creator-page.component.ts
+++ b/src/app/components/creator/home-creator-page/home-creator-page.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { RoomCreateComponent } from '../_dialogs/room-create/room-create.component';
 import { TranslateService } from '@ngx-translate/core';
-import { LanguageService } from '../../shared/LanguageService';
+import { LanguageService } from '../../../services/util/language.service';
 
 @Component({
   selector: 'app-home-creator-page',
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
index 5ef100f2e15918bc142c18f73661f52e86bc722c..d45f7a3983866fe94e5cf84d204d1487ae529e64 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
@@ -9,7 +9,7 @@ import { MatDialog } from '@angular/material';
 import { RoomDeleteComponent } from '../_dialogs/room-delete/room-delete.component';
 import { RoomEditComponent } from '../_dialogs/room-edit/room-edit.component';
 import { TranslateService } from '@ngx-translate/core';
-import { LanguageService } from '../../shared/LanguageService';
+import { LanguageService } from '../../../services/util/language.service';
 
 @Component({
   selector: 'app-room-creator-page',
diff --git a/src/app/components/participant/content-text-participant/content-text-participant.component.ts b/src/app/components/participant/content-text-participant/content-text-participant.component.ts
index d0f6e47064f8e82dd0ab98bcf1676b51fffdd57a..2b33ea6dd36609609d3df53a991d3ec936662d9c 100644
--- a/src/app/components/participant/content-text-participant/content-text-participant.component.ts
+++ b/src/app/components/participant/content-text-participant/content-text-participant.component.ts
@@ -4,7 +4,7 @@ import { ContentAnswerService } from '../../../services/http/content-answer.serv
 import { AnswerText } from '../../../models/answer-text';
 import { NotificationService } from '../../../services/util/notification.service';
 import { TranslateService } from '@ngx-translate/core';
-import { LanguageService } from '../../shared/LanguageService';
+import { LanguageService } from '../../../services/util/language.service';
 
 @Component({
   selector: 'app-content-text-participant',
diff --git a/src/app/components/participant/home-participant-page/home-participant-page.component.ts b/src/app/components/participant/home-participant-page/home-participant-page.component.ts
index d2f584299c42ee19a50b762526fcb2a9237f2fd0..47b51c925137c474ee32e7fbf908e264034ff987 100644
--- a/src/app/components/participant/home-participant-page/home-participant-page.component.ts
+++ b/src/app/components/participant/home-participant-page/home-participant-page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { LanguageService } from '../../shared/LanguageService';
+import { LanguageService } from '../../../services/util/language.service';
 
 @Component({
   selector: 'app-home-participant-page',
diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.ts b/src/app/components/participant/room-participant-page/room-participant-page.component.ts
index dcbf261dd18066243f6b745d1b7e8edf40188968..b6d4f2c69c14dcb6a2fbd90e2bfe922efe11f4c1 100644
--- a/src/app/components/participant/room-participant-page/room-participant-page.component.ts
+++ b/src/app/components/participant/room-participant-page/room-participant-page.component.ts
@@ -4,7 +4,7 @@ import { Location } from '@angular/common';
 import { RoomService } from '../../../services/http/room.service';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { LanguageService } from '../../shared/LanguageService';
+import { LanguageService } from '../../../services/util/language.service';
 
 @Component({
   selector: 'app-room-participant-page',
diff --git a/src/app/components/shared/comment-list/comment-list.component.ts b/src/app/components/shared/comment-list/comment-list.component.ts
index 52c553f322aebf39d0fcbf880caa04307c3a0504..5c6210a871872150940e8e8fff031bc3cc574b3d 100644
--- a/src/app/components/shared/comment-list/comment-list.component.ts
+++ b/src/app/components/shared/comment-list/comment-list.component.ts
@@ -9,7 +9,7 @@ import { AuthenticationService } from '../../../services/http/authentication.ser
 import { UserRole } from '../../../models/user-roles.enum';
 import { User } from '../../../models/user';
 import {TranslateService} from "@ngx-translate/core";
-import {LanguageService} from "../LanguageService";
+import {LanguageService} from "../../../services/util/language.service";
 
 @Component({
   selector: 'app-comment-list',
diff --git a/src/app/components/shared/content-list/content-list.component.ts b/src/app/components/shared/content-list/content-list.component.ts
index b9301c9208c1e3a918f209d095de5f9368b82c87..348f87a4fe4f9f6e64e0a2b4f4fc3448418f4f7b 100644
--- a/src/app/components/shared/content-list/content-list.component.ts
+++ b/src/app/components/shared/content-list/content-list.component.ts
@@ -14,7 +14,7 @@ import { NotificationService } from '../../../services/util/notification.service
 import { Room } from '../../../models/room';
 import { RoomService } from '../../../services/http/room.service';
 import {TranslateService} from "@ngx-translate/core";
-import {LanguageService} from "../LanguageService";
+import {LanguageService} from "../../../services/util/language.service";
 
 class ContentGroup {
   name: string;
diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts
index 231a71fdc8e1ee3f812d590e659c0d6d706aef1e..84fd00239c3ccc8bf32ff460c32864451a3cf370 100644
--- a/src/app/components/shared/header/header.component.ts
+++ b/src/app/components/shared/header/header.component.ts
@@ -6,7 +6,7 @@ import { User } from '../../../models/user';
 import { UserRole } from '../../../models/user-roles.enum';
 import { Location } from '@angular/common';
 import { TranslateService } from '@ngx-translate/core';
-import { LanguageService } from '../LanguageService';
+import { LanguageService } from '../../../services/util/language.service';
 
 @Component({
   selector: 'app-header',
diff --git a/src/app/components/shared/LanguageService.ts b/src/app/services/util/language.service.ts
similarity index 100%
rename from src/app/components/shared/LanguageService.ts
rename to src/app/services/util/language.service.ts