diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 4acfc7b..5f2a9e6 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,9 +1,9 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { DashboardComponent } from './components/dashboard/dashboard.component';
-import { UserstoryTableComponent } from './components/userstory-table/userstory-table.component';
-import { TaskTableComponent } from './components/task-table/task-table.component';
-import { SprintTableComponent } from './components/sprint-table/sprint-table.component';
+import { UserstoryTableComponent } from './components/tabels/userstory/userstory-table.component';
+import { TaskTableComponent } from './components/tabels/task/task-table.component';
+import { SprintTableComponent } from './components/tabels/sprint/sprint-table.component';
 import {BacklogComponent} from './components/backlog-table/backlog.component';
 
 const routes: Routes = [
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index e11e331..4cdd16a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,9 +11,9 @@ import { TaskFormComponent } from './components/task-form/task-form.component';
 import { UserstoryFormComponent } from './components/userstory-form/userstory-form.component';
 import { SprintFormComponent } from './components/sprint-form/sprint-form.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { UserstoryTableComponent } from './components/userstory-table/userstory-table.component';
-import { TaskTableComponent } from './components/task-table/task-table.component';
-import { SprintTableComponent } from './components/sprint-table/sprint-table.component';
+import { UserstoryTableComponent } from './components/tabels/userstory/userstory-table.component';
+import { TaskTableComponent } from './components/tabels/task/task-table.component';
+import { SprintTableComponent } from './components/tabels/sprint/sprint-table.component';
 import { DashboardComponent } from './components/dashboard/dashboard.component';
 import { UserstoryInnerTableComponent } from './components/userstory-inner-table/userstory-inner-table.component';
 import { BacklogComponent } from './components/backlog-table/backlog.component';
diff --git a/src/app/components/sprint-table/sprint-table.component.css b/src/app/components/tabels/sprint/sprint-table.component.css
similarity index 100%
rename from src/app/components/sprint-table/sprint-table.component.css
rename to src/app/components/tabels/sprint/sprint-table.component.css
diff --git a/src/app/components/sprint-table/sprint-table.component.html b/src/app/components/tabels/sprint/sprint-table.component.html
similarity index 100%
rename from src/app/components/sprint-table/sprint-table.component.html
rename to src/app/components/tabels/sprint/sprint-table.component.html
diff --git a/src/app/components/sprint-table/sprint-table.component.ts b/src/app/components/tabels/sprint/sprint-table.component.ts
similarity index 90%
rename from src/app/components/sprint-table/sprint-table.component.ts
rename to src/app/components/tabels/sprint/sprint-table.component.ts
index 3d18bc7..e349984 100644
--- a/src/app/components/sprint-table/sprint-table.component.ts
+++ b/src/app/components/tabels/sprint/sprint-table.component.ts
@@ -1,9 +1,9 @@
 import {Component} from '@angular/core';
-import {BackendService, ScrumSprint} from '../../services/backend.service';
-import {TableComponentBase} from '../../services/table-component.base';
+import {BackendService, ScrumSprint} from '../../../services/backend.service';
+import {TableComponentBase} from '../../../services/table-component.base';
 import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
 import {ActivatedRoute, ParamMap, Router} from '@angular/router';
-import { SprintFormComponent } from '../sprint-form/sprint-form.component';
+import { SprintFormComponent } from '../../sprint-form/sprint-form.component';
 
 @Component({
   selector: 'app-sprint',
diff --git a/src/app/components/task-table/task-table.component.css b/src/app/components/tabels/task/task-table.component.css
similarity index 100%
rename from src/app/components/task-table/task-table.component.css
rename to src/app/components/tabels/task/task-table.component.css
diff --git a/src/app/components/task-table/task-table.component.html b/src/app/components/tabels/task/task-table.component.html
similarity index 100%
rename from src/app/components/task-table/task-table.component.html
rename to src/app/components/tabels/task/task-table.component.html
diff --git a/src/app/components/task-table/task-table.component.ts b/src/app/components/tabels/task/task-table.component.ts
similarity index 94%
rename from src/app/components/task-table/task-table.component.ts
rename to src/app/components/tabels/task/task-table.component.ts
index a5559d2..d86ebfd 100644
--- a/src/app/components/task-table/task-table.component.ts
+++ b/src/app/components/tabels/task/task-table.component.ts
@@ -5,12 +5,12 @@ import {
   ScrumStatus,
   ScrumUser,
   ScrumCategory,
-} from '../../services/backend.service';
+} from '../../../services/backend.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TaskFormComponent } from '../task-form/task-form.component';
-import { TableComponentBase } from '../../services/table-component.base';
+import { TaskFormComponent } from '../../task-form/task-form.component';
+import { TableComponentBase } from '../../../services/table-component.base';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
-import { getNumberForPriority } from '../../services/sorting.service';
+import { getNumberForPriority } from '../../../services/sorting.service';
 import { NONE_TYPE } from '@angular/compiler';
 
 @Component({
diff --git a/src/app/components/userstory-table/userstory-table.component.css b/src/app/components/tabels/userstory/userstory-table.component.css
similarity index 100%
rename from src/app/components/userstory-table/userstory-table.component.css
rename to src/app/components/tabels/userstory/userstory-table.component.css
diff --git a/src/app/components/userstory-table/userstory-table.component.html b/src/app/components/tabels/userstory/userstory-table.component.html
similarity index 100%
rename from src/app/components/userstory-table/userstory-table.component.html
rename to src/app/components/tabels/userstory/userstory-table.component.html
diff --git a/src/app/components/userstory-table/userstory-table.component.ts b/src/app/components/tabels/userstory/userstory-table.component.ts
similarity index 92%
rename from src/app/components/userstory-table/userstory-table.component.ts
rename to src/app/components/tabels/userstory/userstory-table.component.ts
index fba1dd1..35bb9a9 100644
--- a/src/app/components/userstory-table/userstory-table.component.ts
+++ b/src/app/components/tabels/userstory/userstory-table.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import {
   BackendService,
   ScrumUserstory,
-} from '../../services/backend.service';
+} from '../../../services/backend.service';
 
 @Component({
   selector: 'app-userstory-table',