diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index c66e85b..624d876 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -10,13 +10,13 @@ import { AppComponent } from './app.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { HeaderComponent } from './header/header.component';
 import { LoginComponent } from './login/login.component';
-import { MarkdownService } from './markdown.service';
-import { TerminadoService } from './terminado.service';
+import { MarkdownService } from './services/markdown.service';
+import { TerminadoService } from './services/terminado.service';
 import { WebideComponent } from './webide/webide.component';
 import { MessagesComponent } from './messages/messages.component';
-import { WebSocketService } from './websocket.service';
+import { WebSocketService } from './services/websocket.service';
 import { TerminalComponent } from './terminal/terminal.component';
-import { FSMUpdateService } from './fsmupdate.service';
+import { FSMUpdateService } from './services/fsmupdate.service';
 import { AppRoutingModule } from './app-routing.module';
 
 
diff --git a/src/app/messages/messages.component.ts b/src/app/messages/messages.component.ts
index 6b4c30c..4649205 100644
--- a/src/app/messages/messages.component.ts
+++ b/src/app/messages/messages.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { MarkdownService } from '../markdown.service';
-import { WebSocketService } from '../websocket.service';
+import { MarkdownService } from '../services/markdown.service';
+import { WebSocketService } from '../services/websocket.service';
 
 import { Message } from './message';
 
diff --git a/src/app/fsmupdate.service.ts b/src/app/services/fsmupdate.service.ts
similarity index 100%
rename from src/app/fsmupdate.service.ts
rename to src/app/services/fsmupdate.service.ts
diff --git a/src/app/fsmupdate.ts b/src/app/services/fsmupdate.ts
similarity index 100%
rename from src/app/fsmupdate.ts
rename to src/app/services/fsmupdate.ts
diff --git a/src/app/markdown.service.ts b/src/app/services/markdown.service.ts
similarity index 100%
rename from src/app/markdown.service.ts
rename to src/app/services/markdown.service.ts
diff --git a/src/app/terminado.service.ts b/src/app/services/terminado.service.ts
similarity index 100%
rename from src/app/terminado.service.ts
rename to src/app/services/terminado.service.ts
diff --git a/src/app/websocket.service.ts b/src/app/services/websocket.service.ts
similarity index 100%
rename from src/app/websocket.service.ts
rename to src/app/services/websocket.service.ts
diff --git a/src/app/wsmessage.ts b/src/app/services/wsmessage.ts
similarity index 100%
rename from src/app/wsmessage.ts
rename to src/app/services/wsmessage.ts
diff --git a/src/app/terminal/terminal.component.ts b/src/app/terminal/terminal.component.ts
index 5255dd4..70fc289 100644
--- a/src/app/terminal/terminal.component.ts
+++ b/src/app/terminal/terminal.component.ts
@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { TerminadoService } from '../terminado.service';
+import { TerminadoService } from '../services/terminado.service';
 
 
 @Component({
diff --git a/src/app/webide/webide.component.ts b/src/app/webide/webide.component.ts
index 32e50fe..7509f20 100644
--- a/src/app/webide/webide.component.ts
+++ b/src/app/webide/webide.component.ts
@@ -13,7 +13,7 @@ import 'brace/mode/sql';
 
 import 'brace/theme/monokai';
 import { SourceCode } from './source-code';
-import { WebSocketService } from '../websocket.service';
+import { WebSocketService } from '../services/websocket.service';
 
 const modelist = brace.acequire('ace/ext/modelist');