From c40ef93da46923bbb7d0d22124a88700c04e8b5f Mon Sep 17 00:00:00 2001
From: Jorge Flores <jflores@ioet.com>
Date: Fri, 27 Mar 2020 17:14:32 -0500
Subject: [PATCH 1/2] 51 Improve Structure

---
 src/app/app-routing.module.ts                 |  11 +-
 src/app/app.module.ts                         |  37 +++--
 .../activities-management.component.css       |  22 ---
 .../activities-management.component.html      |   7 -
 .../project-management.component.html         |  17 ---
 .../reports/reports.component.html            |   5 -
 .../time-clock/time-clock.component.scss      |  10 --
 .../shared/navbar/navbar.component.html       |   9 --
 .../shared/sidebar/sidebar.component.html     |  21 ---
 .../shared/sidebar/sidebar.component.scss     |  42 ------
 .../shared/user/user.component.html           |   9 --
 src/app/interfaces/index.ts                   |   2 -
 .../activity-list.component.html              |  10 +-
 .../activity-list.component.scss}             |   0
 .../activity-list.component.spec.ts           |   0
 .../activity-list/activity-list.component.ts  |   4 +-
 .../create-activity.component.html            |   0
 .../create-activity.component.scss}           |   0
 .../create-activity.component.spec.ts         |   0
 .../create-activity.component.ts              |   4 +-
 .../activities-management/components/index.ts |   2 +
 .../models/activity.model.ts}                 |   0
 .../activities-management/models/index.ts     |   1 +
 .../activities-management.component.html      |   7 +
 .../activities-management.component.scss      |  21 +++
 .../activities-management.component.spec.ts   |   5 +-
 .../pages}/activities-management.component.ts |   6 +-
 .../services/activity.service.spec.ts         |   9 +-
 .../services/activity.service.ts              |   2 +-
 .../activities-management/store/.gitkeep}     |   0
 .../create-project.component.html             |   0
 .../create-project.component.scss             |   0
 .../create-project.component.spec.ts          |   3 +-
 .../create-project.component.ts               |  17 +--
 .../project-management/components/index.ts    |   2 +
 .../project-list/project-list.component.html  |  11 +-
 .../project-list/project-list.component.scss  |   0
 .../project-list.component.spec.ts            |   0
 .../project-list/project-list.component.ts    |  14 +-
 .../project-management/models/.gitkeep}       |   0
 .../pages/project-management.component.html   |  17 +++
 .../pages}/project-management.component.scss  |   0
 .../project-management.component.spec.ts      |   9 +-
 .../pages}/project-management.component.ts    |   4 +-
 .../services/project.service.spec.ts          |   8 +-
 .../services/project.service.ts               |   2 +-
 .../project-management/store/.gitkeep}        |   0
 src/app/modules/reports/components/.gitkeep   |   0
 src/app/modules/reports/models/.gitkeep       |   0
 .../reports/pages/reports.component.html      |   3 +
 .../reports/pages/reports.component.scss      |   0
 .../reports/pages}/reports.component.spec.ts  |   2 +-
 .../reports/pages}/reports.component.ts       |   0
 src/app/modules/reports/services/.gitkeep     |   0
 src/app/modules/reports/store/.gitkeep        |   0
 .../components}/clock/clock.component.html    |   0
 .../components}/clock/clock.component.scss    |   4 +-
 .../components}/clock/clock.component.spec.ts |   1 -
 .../components}/clock/clock.component.ts      |   2 +-
 .../details-fields.component.html             |   0
 .../details-fields.component.scss             |   0
 .../details-fields.component.spec.ts          |   4 +-
 .../details-fields.component.ts               |  14 +-
 .../empty-state/empty-state.component.html    |   0
 .../empty-state/empty-state.component.scss    |   0
 .../empty-state/empty-state.component.spec.ts |   0
 .../empty-state/empty-state.component.ts      |   0
 src/app/modules/shared/components/index.ts    |   8 ++
 .../components}/modal/modal.component.html    |   0
 .../components/modal/modal.component.scss     |   0
 .../components}/modal/modal.component.spec.ts |   0
 .../components}/modal/modal.component.ts      |   2 +-
 .../month-picker/month-picker.component.html  |   0
 .../month-picker/month-picker.component.scss  |   0
 .../month-picker.component.spec.ts            |   0
 .../month-picker/month-picker.component.ts    |   0
 .../components/navbar/navbar.component.html   |   8 ++
 .../components/navbar/navbar.component.scss   |   0
 .../navbar/navbar.component.spec.ts           |   0
 .../components}/navbar/navbar.component.ts    |   0
 .../components/sidebar/sidebar.component.html |  26 ++++
 .../components/sidebar/sidebar.component.scss |  42 ++++++
 .../sidebar/sidebar.component.spec.ts         |   0
 .../components}/sidebar/sidebar.component.ts  |   0
 .../components/user/user.component.html       |  19 +++
 .../components}/user/user.component.scss      |   2 +-
 .../components}/user/user.component.spec.ts   |   0
 .../shared/components}/user/user.component.ts |   0
 .../shared/models/entry.model.ts}             |   0
 src/app/modules/shared/models/index.ts        |   2 +
 .../shared/models/project.model.ts}           |   0
 .../group-by-date/group-by-date.pipe.spec.ts  |   0
 .../pipes/group-by-date/group-by-date.pipe.ts |   8 +-
 src/app/modules/shared/pipes/index.ts         |   1 +
 .../modules/time-clock/components/index.ts    |   1 +
 .../project-list-hover.component.html         |   0
 .../project-list-hover.component.scss         |   0
 .../project-list-hover.component.spec.ts      |  16 +--
 .../project-list-hover.component.ts           |   8 +-
 src/app/modules/time-clock/models/.gitkeep    |   0
 .../pages}/time-clock.component.html          |   0
 .../pages/time-clock.component.scss           |  10 ++
 .../pages}/time-clock.component.spec.ts       | 134 +++++++++---------
 .../time-clock/pages}/time-clock.component.ts |   0
 src/app/modules/time-clock/services/.gitkeep  |   0
 src/app/modules/time-clock/store/.gitkeep     |   0
 .../modules/time-entries/components/.gitkeep  |   0
 src/app/modules/time-entries/models/.gitkeep  |   0
 .../pages}/time-entries.component.html        |   0
 .../pages}/time-entries.component.scss        |  20 +--
 .../pages}/time-entries.component.spec.ts     |  16 ++-
 .../pages}/time-entries.component.ts          |   4 +-
 .../modules/time-entries/services/.gitkeep    |   0
 src/app/modules/time-entries/store/.gitkeep   |   0
 114 files changed, 361 insertions(+), 346 deletions(-)
 delete mode 100644 src/app/components/options-sidebar/activities/activities-management/activities-management.component.css
 delete mode 100644 src/app/components/options-sidebar/activities/activities-management/activities-management.component.html
 delete mode 100644 src/app/components/options-sidebar/project-management/project-management.component.html
 delete mode 100644 src/app/components/options-sidebar/reports/reports.component.html
 delete mode 100644 src/app/components/options-sidebar/time-clock/time-clock.component.scss
 delete mode 100644 src/app/components/shared/navbar/navbar.component.html
 delete mode 100644 src/app/components/shared/sidebar/sidebar.component.html
 delete mode 100644 src/app/components/shared/sidebar/sidebar.component.scss
 delete mode 100644 src/app/components/shared/user/user.component.html
 delete mode 100644 src/app/interfaces/index.ts
 rename src/app/{components/options-sidebar/activities => modules/activities-management/components}/activity-list/activity-list.component.html (82%)
 rename src/app/{components/options-sidebar/activities/activity-list/activity-list.component.css => modules/activities-management/components/activity-list/activity-list.component.scss} (100%)
 rename src/app/{components/options-sidebar/activities => modules/activities-management/components}/activity-list/activity-list.component.spec.ts (100%)
 rename src/app/{components/options-sidebar/activities => modules/activities-management/components}/activity-list/activity-list.component.ts (74%)
 rename src/app/{components/options-sidebar/activities => modules/activities-management/components}/create-activity/create-activity.component.html (100%)
 rename src/app/{components/options-sidebar/activities/create-activity/create-activity.component.css => modules/activities-management/components/create-activity/create-activity.component.scss} (100%)
 rename src/app/{components/options-sidebar/activities => modules/activities-management/components}/create-activity/create-activity.component.spec.ts (100%)
 rename src/app/{components/options-sidebar/activities => modules/activities-management/components}/create-activity/create-activity.component.ts (89%)
 create mode 100644 src/app/modules/activities-management/components/index.ts
 rename src/app/{components/options-sidebar/activities/model/activity.ts => modules/activities-management/models/activity.model.ts} (100%)
 create mode 100644 src/app/modules/activities-management/models/index.ts
 create mode 100644 src/app/modules/activities-management/pages/activities-management.component.html
 create mode 100644 src/app/modules/activities-management/pages/activities-management.component.scss
 rename src/app/{components/options-sidebar/activities/activities-management => modules/activities-management/pages}/activities-management.component.spec.ts (95%)
 rename src/app/{components/options-sidebar/activities/activities-management => modules/activities-management/pages}/activities-management.component.ts (71%)
 rename src/app/{components/options-sidebar/activities => modules/activities-management}/services/activity.service.spec.ts (83%)
 rename src/app/{components/options-sidebar/activities => modules/activities-management}/services/activity.service.ts (88%)
 rename src/app/{components/options-sidebar/reports/reports.component.scss => modules/activities-management/store/.gitkeep} (100%)
 rename src/app/{components/shared => modules/project-management/components}/create-project/create-project.component.html (100%)
 rename src/app/{components/shared => modules/project-management/components}/create-project/create-project.component.scss (100%)
 rename src/app/{components/shared => modules/project-management/components}/create-project/create-project.component.spec.ts (97%)
 rename src/app/{components/shared => modules/project-management/components}/create-project/create-project.component.ts (80%)
 create mode 100644 src/app/modules/project-management/components/index.ts
 rename src/app/{components/shared => modules/project-management/components}/project-list/project-list.component.html (84%)
 rename src/app/{components/shared => modules/project-management/components}/project-list/project-list.component.scss (100%)
 rename src/app/{components/shared => modules/project-management/components}/project-list/project-list.component.spec.ts (100%)
 rename src/app/{components/shared => modules/project-management/components}/project-list/project-list.component.ts (73%)
 rename src/app/{components/shared/modal/modal.component.scss => modules/project-management/models/.gitkeep} (100%)
 create mode 100644 src/app/modules/project-management/pages/project-management.component.html
 rename src/app/{components/options-sidebar/project-management => modules/project-management/pages}/project-management.component.scss (100%)
 rename src/app/{components/options-sidebar/project-management => modules/project-management/pages}/project-management.component.spec.ts (92%)
 rename src/app/{components/options-sidebar/project-management => modules/project-management/pages}/project-management.component.ts (93%)
 rename src/app/{ => modules/project-management}/services/project.service.spec.ts (89%)
 rename src/app/{ => modules/project-management}/services/project.service.ts (89%)
 rename src/app/{components/shared/navbar/navbar.component.scss => modules/project-management/store/.gitkeep} (100%)
 create mode 100644 src/app/modules/reports/components/.gitkeep
 create mode 100644 src/app/modules/reports/models/.gitkeep
 create mode 100644 src/app/modules/reports/pages/reports.component.html
 create mode 100644 src/app/modules/reports/pages/reports.component.scss
 rename src/app/{components/options-sidebar/reports => modules/reports/pages}/reports.component.spec.ts (99%)
 rename src/app/{components/options-sidebar/reports => modules/reports/pages}/reports.component.ts (100%)
 create mode 100644 src/app/modules/reports/services/.gitkeep
 create mode 100644 src/app/modules/reports/store/.gitkeep
 rename src/app/{components/shared => modules/shared/components}/clock/clock.component.html (100%)
 rename src/app/{components/shared => modules/shared/components}/clock/clock.component.scss (51%)
 rename src/app/{components/shared => modules/shared/components}/clock/clock.component.spec.ts (96%)
 rename src/app/{components/shared => modules/shared/components}/clock/clock.component.ts (95%)
 rename src/app/{components/shared => modules/shared/components}/details-fields/details-fields.component.html (100%)
 rename src/app/{components/shared => modules/shared/components}/details-fields/details-fields.component.scss (100%)
 rename src/app/{components/shared => modules/shared/components}/details-fields/details-fields.component.spec.ts (99%)
 rename src/app/{components/shared => modules/shared/components}/details-fields/details-fields.component.ts (84%)
 rename src/app/{components/shared => modules/shared/components}/empty-state/empty-state.component.html (100%)
 rename src/app/{components/shared => modules/shared/components}/empty-state/empty-state.component.scss (100%)
 rename src/app/{components/shared => modules/shared/components}/empty-state/empty-state.component.spec.ts (100%)
 rename src/app/{components/shared => modules/shared/components}/empty-state/empty-state.component.ts (100%)
 create mode 100644 src/app/modules/shared/components/index.ts
 rename src/app/{components/shared => modules/shared/components}/modal/modal.component.html (100%)
 create mode 100644 src/app/modules/shared/components/modal/modal.component.scss
 rename src/app/{components/shared => modules/shared/components}/modal/modal.component.spec.ts (100%)
 rename src/app/{components/shared => modules/shared/components}/modal/modal.component.ts (92%)
 rename src/app/{components/shared => modules/shared/components}/month-picker/month-picker.component.html (100%)
 rename src/app/{components/shared => modules/shared/components}/month-picker/month-picker.component.scss (100%)
 rename src/app/{components/shared => modules/shared/components}/month-picker/month-picker.component.spec.ts (100%)
 rename src/app/{components/shared => modules/shared/components}/month-picker/month-picker.component.ts (100%)
 create mode 100644 src/app/modules/shared/components/navbar/navbar.component.html
 create mode 100644 src/app/modules/shared/components/navbar/navbar.component.scss
 rename src/app/{components/shared => modules/shared/components}/navbar/navbar.component.spec.ts (100%)
 rename src/app/{components/shared => modules/shared/components}/navbar/navbar.component.ts (100%)
 create mode 100644 src/app/modules/shared/components/sidebar/sidebar.component.html
 create mode 100644 src/app/modules/shared/components/sidebar/sidebar.component.scss
 rename src/app/{components/shared => modules/shared/components}/sidebar/sidebar.component.spec.ts (100%)
 rename src/app/{components/shared => modules/shared/components}/sidebar/sidebar.component.ts (100%)
 create mode 100644 src/app/modules/shared/components/user/user.component.html
 rename src/app/{components/shared => modules/shared/components}/user/user.component.scss (75%)
 rename src/app/{components/shared => modules/shared/components}/user/user.component.spec.ts (100%)
 rename src/app/{components/shared => modules/shared/components}/user/user.component.ts (100%)
 rename src/app/{interfaces/entry.ts => modules/shared/models/entry.model.ts} (100%)
 create mode 100644 src/app/modules/shared/models/index.ts
 rename src/app/{interfaces/project.ts => modules/shared/models/project.model.ts} (100%)
 rename src/app/{components => modules}/shared/pipes/group-by-date/group-by-date.pipe.spec.ts (100%)
 rename src/app/{components => modules}/shared/pipes/group-by-date/group-by-date.pipe.ts (75%)
 create mode 100644 src/app/modules/shared/pipes/index.ts
 create mode 100644 src/app/modules/time-clock/components/index.ts
 rename src/app/{components/shared => modules/time-clock/components}/project-list-hover/project-list-hover.component.html (100%)
 rename src/app/{components/shared => modules/time-clock/components}/project-list-hover/project-list-hover.component.scss (100%)
 rename src/app/{components/shared => modules/time-clock/components}/project-list-hover/project-list-hover.component.spec.ts (64%)
 rename src/app/{components/shared => modules/time-clock/components}/project-list-hover/project-list-hover.component.ts (61%)
 create mode 100644 src/app/modules/time-clock/models/.gitkeep
 rename src/app/{components/options-sidebar/time-clock => modules/time-clock/pages}/time-clock.component.html (100%)
 create mode 100644 src/app/modules/time-clock/pages/time-clock.component.scss
 rename src/app/{components/options-sidebar/time-clock => modules/time-clock/pages}/time-clock.component.spec.ts (65%)
 rename src/app/{components/options-sidebar/time-clock => modules/time-clock/pages}/time-clock.component.ts (100%)
 create mode 100644 src/app/modules/time-clock/services/.gitkeep
 create mode 100644 src/app/modules/time-clock/store/.gitkeep
 create mode 100644 src/app/modules/time-entries/components/.gitkeep
 create mode 100644 src/app/modules/time-entries/models/.gitkeep
 rename src/app/{components/options-sidebar/time-entries => modules/time-entries/pages}/time-entries.component.html (100%)
 rename src/app/{components/options-sidebar/time-entries => modules/time-entries/pages}/time-entries.component.scss (77%)
 rename src/app/{components/options-sidebar/time-entries => modules/time-entries/pages}/time-entries.component.spec.ts (85%)
 rename src/app/{components/options-sidebar/time-entries => modules/time-entries/pages}/time-entries.component.ts (97%)
 create mode 100644 src/app/modules/time-entries/services/.gitkeep
 create mode 100644 src/app/modules/time-entries/store/.gitkeep

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 21b712fa5..5be963b0a 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,11 +1,10 @@
-// tslint:disable-next-line:max-line-length
-import { ActivitiesManagementComponent } from './components/options-sidebar/activities/activities-management/activities-management.component';
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { ReportsComponent } from './components/options-sidebar/reports/reports.component';
-import { TimeClockComponent } from './components/options-sidebar/time-clock/time-clock.component';
-import { TimeEntriesComponent } from './components/options-sidebar/time-entries/time-entries.component';
-import { ProjectManagementComponent } from './components/options-sidebar/project-management/project-management.component';
+import { ReportsComponent } from './modules/reports/pages/reports.component';
+import { TimeClockComponent } from './modules/time-clock/pages/time-clock.component';
+import { TimeEntriesComponent } from './modules/time-entries/pages/time-entries.component';
+import { ProjectManagementComponent } from './modules/project-management/pages/project-management.component';
+import { ActivitiesManagementComponent } from './modules/activities-management/pages/activities-management.component';
 
 const routes: Routes = [
   {path: 'reports', component: ReportsComponent},
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 74ac726c5..d2d216329 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,5 +1,3 @@
-import { ActivityListComponent } from './components/options-sidebar/activities/activity-list/activity-list.component';
-import { CreateActivityComponent } from './components/options-sidebar/activities/create-activity/create-activity.component';
 import { CommonModule } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
@@ -8,23 +6,24 @@ import { HttpClientModule } from '@angular/common/http';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { NavbarComponent } from './components/shared/navbar/navbar.component';
-import { UserComponent } from './components/shared/user/user.component';
-import { SidebarComponent } from './components/shared/sidebar/sidebar.component';
-import { ClockComponent } from './components/shared/clock/clock.component';
-import { TimeClockComponent } from './components/options-sidebar/time-clock/time-clock.component';
-import { ProjectManagementComponent } from './components/options-sidebar/project-management/project-management.component';
-import { TimeEntriesComponent } from './components/options-sidebar/time-entries/time-entries.component';
-import { ProjectListComponent } from './components/shared/project-list/project-list.component';
-import { CreateProjectComponent } from './components/shared/create-project/create-project.component';
-import { DetailsFieldsComponent } from './components/shared/details-fields/details-fields.component';
-import { ProjectListHoverComponent } from './components/shared/project-list-hover/project-list-hover.component';
-import { ModalComponent } from './components/shared/modal/modal.component';
-import { MonthPickerComponent } from './components/shared/month-picker/month-picker.component';
-import { EmptyStateComponent } from './components/shared/empty-state/empty-state.component';
-import { GroupByDatePipe } from './components/shared/pipes/group-by-date/group-by-date.pipe';
-// tslint:disable-next-line:max-line-length
-import { ActivitiesManagementComponent } from './components/options-sidebar/activities/activities-management/activities-management.component';
+import { NavbarComponent } from './modules/shared/components/navbar/navbar.component';
+import { UserComponent } from './modules/shared/components/user/user.component';
+import { SidebarComponent } from './modules/shared/components/sidebar/sidebar.component';
+import { ClockComponent } from './modules/shared/components/clock/clock.component';
+import { TimeClockComponent } from './modules/time-clock/pages/time-clock.component';
+import { ProjectManagementComponent } from './modules/project-management/pages/project-management.component';
+import { TimeEntriesComponent } from './modules/time-entries/pages/time-entries.component';
+import { ProjectListComponent } from './modules/project-management/components/project-list/project-list.component';
+import { CreateProjectComponent } from './modules/project-management/components/create-project/create-project.component';
+import { DetailsFieldsComponent } from './modules/shared/components/details-fields/details-fields.component';
+import { ProjectListHoverComponent } from './modules/time-clock/components/project-list-hover/project-list-hover.component';
+import { ModalComponent } from './modules/shared/components/modal/modal.component';
+import { MonthPickerComponent } from './modules/shared/components/month-picker/month-picker.component';
+import { EmptyStateComponent } from './modules/shared/components/empty-state/empty-state.component';
+import { GroupByDatePipe } from './modules/shared/pipes/group-by-date/group-by-date.pipe';
+import { ActivitiesManagementComponent } from './modules/activities-management/pages/activities-management.component';
+import { ActivityListComponent } from './modules/activities-management/components/activity-list/activity-list.component';
+import { CreateActivityComponent } from './modules/activities-management/components/create-activity/create-activity.component';
 
 
 @NgModule({
diff --git a/src/app/components/options-sidebar/activities/activities-management/activities-management.component.css b/src/app/components/options-sidebar/activities/activities-management/activities-management.component.css
deleted file mode 100644
index 5c8b26d17..000000000
--- a/src/app/components/options-sidebar/activities/activities-management/activities-management.component.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.parent {
-    display: flex;
-  }
-  
-  .item {
-    width: 50%;
-    margin: 2em;
-    min-height: 500px;
-    max-height: 500px;
-  }
-  
-  @media screen and (max-width: 600px){
-    .parent {
-      flex-direction: column-reverse;
-    }
-  
-    .item {
-      width: auto;
-      min-height: 200px;
-    }
-  }
-  
\ No newline at end of file
diff --git a/src/app/components/options-sidebar/activities/activities-management/activities-management.component.html b/src/app/components/options-sidebar/activities/activities-management/activities-management.component.html
deleted file mode 100644
index 64f49bcc2..000000000
--- a/src/app/components/options-sidebar/activities/activities-management/activities-management.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="parent">
-    <app-create-activity class="item">
-    </app-create-activity>
-
-    <app-activity-list [activities]="activities" class="item">
-    </app-activity-list>
-</div>
\ No newline at end of file
diff --git a/src/app/components/options-sidebar/project-management/project-management.component.html b/src/app/components/options-sidebar/project-management/project-management.component.html
deleted file mode 100644
index bc3f14b30..000000000
--- a/src/app/components/options-sidebar/project-management/project-management.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="parent">
-  
-  <app-create-project class="item"
-    [projectToEdit] = "project"
-    (savedProject)="updateProject($event)"
-    (cancelForm) = "cancelForm()"
-  >
-  </app-create-project>
-
-  <app-project-list class="item"
-  [projects] = "projects"
-  (editProject) = "editProject($event)"
-  (deleteProject) = "deleteProject($event)"
-  >
-  </app-project-list>
-</div>
-
diff --git a/src/app/components/options-sidebar/reports/reports.component.html b/src/app/components/options-sidebar/reports/reports.component.html
deleted file mode 100644
index c779010be..000000000
--- a/src/app/components/options-sidebar/reports/reports.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="text-center mt-5">
-
-    <p>reports works!</p>
-
-</div>
\ No newline at end of file
diff --git a/src/app/components/options-sidebar/time-clock/time-clock.component.scss b/src/app/components/options-sidebar/time-clock/time-clock.component.scss
deleted file mode 100644
index a3d8d5059..000000000
--- a/src/app/components/options-sidebar/time-clock/time-clock.component.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.content-ClockIn {
-    padding: 2.1rem 1rem;
-}
-
-.timer {
-    align-items: center;
-    display: flex;
-    height: 100%;
-    justify-content: center;
-}
\ No newline at end of file
diff --git a/src/app/components/shared/navbar/navbar.component.html b/src/app/components/shared/navbar/navbar.component.html
deleted file mode 100644
index e8a6fca69..000000000
--- a/src/app/components/shared/navbar/navbar.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<nav class="navbar navbar-dark bg-dark">
-    <a class="navbar-brand" href="#">
-        <img src="assets/img/ioet.png" width="20" height="35" class="d-inline-block align-top" alt="">
-    </a>
-
-    <app-clock class="text-center"></app-clock>
-    <app-user></app-user>
-
-</nav>
\ No newline at end of file
diff --git a/src/app/components/shared/sidebar/sidebar.component.html b/src/app/components/shared/sidebar/sidebar.component.html
deleted file mode 100644
index 2c0ffab3a..000000000
--- a/src/app/components/shared/sidebar/sidebar.component.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="d-flex" id="wrapper">
-    <!-- Sidebar -->
-    <div class="bg-light border-right" id="sidebar-wrapper">
-        <div class="list-group list-group-flush">
-          <a [routerLink]="['/time-clock']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-clock"></i>   Time Clock</a>
-          <a [routerLink]="['/time-entries']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-list-alt"></i>  Time Entries</a>
-          <a [routerLink]="['/reports']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="fas fa-chart-pie"></i>   Reports</a>
-          <a [routerLink]="['/project-management']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-folder-open"></i>   Projects</a>
-          <a [routerLink]="['/activities-management']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-file-alt"></i>   Activities</a>
-        </div>
-    </div>
-    <!-- /#sidebar-wrapper -->
-
-    <!-- Page Content -->
-    <div class="container">
-        <router-outlet></router-outlet>
-    </div>
-    <!-- /#page-content-wrapper -->
-
-</div>
-<!-- /#wrapper -->
diff --git a/src/app/components/shared/sidebar/sidebar.component.scss b/src/app/components/shared/sidebar/sidebar.component.scss
deleted file mode 100644
index 3a0994ff8..000000000
--- a/src/app/components/shared/sidebar/sidebar.component.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-body {
-    overflow-x: hidden;
-}
-
-#sidebar-wrapper {
-    min-height: 100vh;
-    margin-left: -15rem;
-    -webkit-transition: margin .25s ease-out;
-    -moz-transition: margin .25s ease-out;
-    -o-transition: margin .25s ease-out;
-    transition: margin .25s ease-out;
-}
-
-#sidebar-wrapper .sidebar-heading {
-    padding: 0.875rem 1.25rem;
-    font-size: 1.2rem;
-}
-
-#sidebar-wrapper .list-group {
-    width: 15rem;
-}
-
-#page-content-wrapper {
-    min-width: 100vw;
-}
-
-#wrapper.toggled #sidebar-wrapper {
-    margin-left: 0;
-}
-
-@media (min-width: 768px) {
-    #sidebar-wrapper {
-        margin-left: 0;
-    }
-    #page-content-wrapper {
-        min-width: 0;
-        width: 100%;
-    }
-    #wrapper.toggled #sidebar-wrapper {
-        margin-left: -15rem;
-    }
-}
\ No newline at end of file
diff --git a/src/app/components/shared/user/user.component.html b/src/app/components/shared/user/user.component.html
deleted file mode 100644
index 00904eded..000000000
--- a/src/app/components/shared/user/user.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-  <a class="nav-link dropdown-toggle help-color" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-    <i class="far fa-user-circle"></i> Dario Herrera
-  </a>
-
-  <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-    <a class="dropdown-item">Sign Out</a>
-  </div>
-</div>
diff --git a/src/app/interfaces/index.ts b/src/app/interfaces/index.ts
deleted file mode 100644
index e41e3fb3d..000000000
--- a/src/app/interfaces/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './project';
-export * from './entry';
diff --git a/src/app/components/options-sidebar/activities/activity-list/activity-list.component.html b/src/app/modules/activities-management/components/activity-list/activity-list.component.html
similarity index 82%
rename from src/app/components/options-sidebar/activities/activity-list/activity-list.component.html
rename to src/app/modules/activities-management/components/activity-list/activity-list.component.html
index 4d47b3500..256d271c9 100644
--- a/src/app/components/options-sidebar/activities/activity-list/activity-list.component.html
+++ b/src/app/modules/activities-management/components/activity-list/activity-list.component.html
@@ -21,17 +21,11 @@ <h5>Description:</h5>
                             <p>{{activity.description}}</p>
                         </div>
                     </div>
-
                 </div>
             </div>
             <ng-template #notShow>
-                <div class="card">
-                    <div class="card-body">
-                        <h4 class="card-text">There are no activities.</h4>
-                        <h5 class="card-text">Please, create one.</h5>
-                    </div>
-                </div>
+                <app-empty-state></app-empty-state>
             </ng-template>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/components/options-sidebar/activities/activity-list/activity-list.component.css b/src/app/modules/activities-management/components/activity-list/activity-list.component.scss
similarity index 100%
rename from src/app/components/options-sidebar/activities/activity-list/activity-list.component.css
rename to src/app/modules/activities-management/components/activity-list/activity-list.component.scss
diff --git a/src/app/components/options-sidebar/activities/activity-list/activity-list.component.spec.ts b/src/app/modules/activities-management/components/activity-list/activity-list.component.spec.ts
similarity index 100%
rename from src/app/components/options-sidebar/activities/activity-list/activity-list.component.spec.ts
rename to src/app/modules/activities-management/components/activity-list/activity-list.component.spec.ts
diff --git a/src/app/components/options-sidebar/activities/activity-list/activity-list.component.ts b/src/app/modules/activities-management/components/activity-list/activity-list.component.ts
similarity index 74%
rename from src/app/components/options-sidebar/activities/activity-list/activity-list.component.ts
rename to src/app/modules/activities-management/components/activity-list/activity-list.component.ts
index 38f176bf7..652d7eee6 100644
--- a/src/app/components/options-sidebar/activities/activity-list/activity-list.component.ts
+++ b/src/app/modules/activities-management/components/activity-list/activity-list.component.ts
@@ -1,11 +1,11 @@
-import { Activity } from './../model/activity';
 import { Input } from '@angular/core';
 import { Component } from '@angular/core';
+import { Activity } from '../../models';
 
 @Component({
   selector: 'app-activity-list',
   templateUrl: './activity-list.component.html',
-  styleUrls: ['./activity-list.component.css']
+  styleUrls: ['./activity-list.component.scss']
 })
 export class ActivityListComponent {
 
diff --git a/src/app/components/options-sidebar/activities/create-activity/create-activity.component.html b/src/app/modules/activities-management/components/create-activity/create-activity.component.html
similarity index 100%
rename from src/app/components/options-sidebar/activities/create-activity/create-activity.component.html
rename to src/app/modules/activities-management/components/create-activity/create-activity.component.html
diff --git a/src/app/components/options-sidebar/activities/create-activity/create-activity.component.css b/src/app/modules/activities-management/components/create-activity/create-activity.component.scss
similarity index 100%
rename from src/app/components/options-sidebar/activities/create-activity/create-activity.component.css
rename to src/app/modules/activities-management/components/create-activity/create-activity.component.scss
diff --git a/src/app/components/options-sidebar/activities/create-activity/create-activity.component.spec.ts b/src/app/modules/activities-management/components/create-activity/create-activity.component.spec.ts
similarity index 100%
rename from src/app/components/options-sidebar/activities/create-activity/create-activity.component.spec.ts
rename to src/app/modules/activities-management/components/create-activity/create-activity.component.spec.ts
diff --git a/src/app/components/options-sidebar/activities/create-activity/create-activity.component.ts b/src/app/modules/activities-management/components/create-activity/create-activity.component.ts
similarity index 89%
rename from src/app/components/options-sidebar/activities/create-activity/create-activity.component.ts
rename to src/app/modules/activities-management/components/create-activity/create-activity.component.ts
index cf14dedc0..e93c748e8 100644
--- a/src/app/components/options-sidebar/activities/create-activity/create-activity.component.ts
+++ b/src/app/modules/activities-management/components/create-activity/create-activity.component.ts
@@ -1,11 +1,11 @@
 import { FormBuilder, Validators, FormGroup } from '@angular/forms';
-import { Activity } from './../model/activity';
 import { Component, Input } from '@angular/core';
+import { Activity } from '../../models';
 
 @Component({
   selector: 'app-create-activity',
   templateUrl: './create-activity.component.html',
-  styleUrls: ['./create-activity.component.css']
+  styleUrls: ['./create-activity.component.scss']
 })
 export class CreateActivityComponent {
 
diff --git a/src/app/modules/activities-management/components/index.ts b/src/app/modules/activities-management/components/index.ts
new file mode 100644
index 000000000..20391b357
--- /dev/null
+++ b/src/app/modules/activities-management/components/index.ts
@@ -0,0 +1,2 @@
+export * from './activity-list/activity-list.component';
+export * from './create-activity/create-activity.component';
diff --git a/src/app/components/options-sidebar/activities/model/activity.ts b/src/app/modules/activities-management/models/activity.model.ts
similarity index 100%
rename from src/app/components/options-sidebar/activities/model/activity.ts
rename to src/app/modules/activities-management/models/activity.model.ts
diff --git a/src/app/modules/activities-management/models/index.ts b/src/app/modules/activities-management/models/index.ts
new file mode 100644
index 000000000..988095496
--- /dev/null
+++ b/src/app/modules/activities-management/models/index.ts
@@ -0,0 +1 @@
+export * from './activity.model';
diff --git a/src/app/modules/activities-management/pages/activities-management.component.html b/src/app/modules/activities-management/pages/activities-management.component.html
new file mode 100644
index 000000000..aeaeb67d3
--- /dev/null
+++ b/src/app/modules/activities-management/pages/activities-management.component.html
@@ -0,0 +1,7 @@
+<div class="parent">
+  <app-create-activity class="item">
+  </app-create-activity>
+
+  <app-activity-list [activities]="activities" class="item">
+  </app-activity-list>
+</div>
diff --git a/src/app/modules/activities-management/pages/activities-management.component.scss b/src/app/modules/activities-management/pages/activities-management.component.scss
new file mode 100644
index 000000000..6d0d52c61
--- /dev/null
+++ b/src/app/modules/activities-management/pages/activities-management.component.scss
@@ -0,0 +1,21 @@
+.parent {
+    display: flex;
+  }
+
+.item {
+  width: 50%;
+  margin: 2em;
+  min-height: 500px;
+  max-height: 500px;
+}
+
+@media screen and (max-width: 600px){
+  .parent {
+    flex-direction: column-reverse;
+  }
+
+  .item {
+    width: auto;
+    min-height: 200px;
+  }
+}
diff --git a/src/app/components/options-sidebar/activities/activities-management/activities-management.component.spec.ts b/src/app/modules/activities-management/pages/activities-management.component.spec.ts
similarity index 95%
rename from src/app/components/options-sidebar/activities/activities-management/activities-management.component.spec.ts
rename to src/app/modules/activities-management/pages/activities-management.component.spec.ts
index a2152fcac..49cd04af9 100644
--- a/src/app/components/options-sidebar/activities/activities-management/activities-management.component.spec.ts
+++ b/src/app/modules/activities-management/pages/activities-management.component.spec.ts
@@ -1,9 +1,8 @@
 import { HttpClient, HttpHandler } from '@angular/common/http';
-import { Activity } from './../model/activity';
+import { async, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
+import { Activity } from '../models';
 import { ActivityService } from './../services/activity.service';
-import { async, TestBed } from '@angular/core/testing';
-
 import { ActivitiesManagementComponent } from './activities-management.component';
 
 describe('ActivitiesManagementComponent', () => {
diff --git a/src/app/components/options-sidebar/activities/activities-management/activities-management.component.ts b/src/app/modules/activities-management/pages/activities-management.component.ts
similarity index 71%
rename from src/app/components/options-sidebar/activities/activities-management/activities-management.component.ts
rename to src/app/modules/activities-management/pages/activities-management.component.ts
index a4bb8c5e0..0be21501b 100644
--- a/src/app/components/options-sidebar/activities/activities-management/activities-management.component.ts
+++ b/src/app/modules/activities-management/pages/activities-management.component.ts
@@ -1,11 +1,11 @@
-import { Activity } from './../model/activity';
-import { ActivityService } from './../services/activity.service';
 import { Component, OnInit } from '@angular/core';
+import { ActivityService } from '../services/activity.service';
+import { Activity } from '../models';
 
 @Component({
   selector: 'app-activities-management',
   templateUrl: './activities-management.component.html',
-  styleUrls: ['./activities-management.component.css']
+  styleUrls: ['./activities-management.component.scss']
 })
 export class ActivitiesManagementComponent implements OnInit {
 
diff --git a/src/app/components/options-sidebar/activities/services/activity.service.spec.ts b/src/app/modules/activities-management/services/activity.service.spec.ts
similarity index 83%
rename from src/app/components/options-sidebar/activities/services/activity.service.spec.ts
rename to src/app/modules/activities-management/services/activity.service.spec.ts
index d7cc770b2..f9181e0f4 100644
--- a/src/app/components/options-sidebar/activities/services/activity.service.spec.ts
+++ b/src/app/modules/activities-management/services/activity.service.spec.ts
@@ -1,7 +1,7 @@
-import {Activity} from './../model/activity';
-import {ActivityService} from './activity.service';
-import {TestBed, inject, async} from '@angular/core/testing';
-import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
+import { TestBed, inject } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { Activity } from '../models';
+import { ActivityService } from './activity.service';
 
 describe('Activity Service', () => {
   let service: ActivityService;
@@ -39,5 +39,4 @@ describe('Activity Service', () => {
     expect(getActivitiesRequest.request.method).toBe('GET');
     getActivitiesRequest.flush(activities);
   });
-
 });
diff --git a/src/app/components/options-sidebar/activities/services/activity.service.ts b/src/app/modules/activities-management/services/activity.service.ts
similarity index 88%
rename from src/app/components/options-sidebar/activities/services/activity.service.ts
rename to src/app/modules/activities-management/services/activity.service.ts
index 4d9e5e398..f4fde2162 100644
--- a/src/app/components/options-sidebar/activities/services/activity.service.ts
+++ b/src/app/modules/activities-management/services/activity.service.ts
@@ -1,7 +1,7 @@
-import { Activity } from './../model/activity';
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { Activity } from '../models';
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/components/options-sidebar/reports/reports.component.scss b/src/app/modules/activities-management/store/.gitkeep
similarity index 100%
rename from src/app/components/options-sidebar/reports/reports.component.scss
rename to src/app/modules/activities-management/store/.gitkeep
diff --git a/src/app/components/shared/create-project/create-project.component.html b/src/app/modules/project-management/components/create-project/create-project.component.html
similarity index 100%
rename from src/app/components/shared/create-project/create-project.component.html
rename to src/app/modules/project-management/components/create-project/create-project.component.html
diff --git a/src/app/components/shared/create-project/create-project.component.scss b/src/app/modules/project-management/components/create-project/create-project.component.scss
similarity index 100%
rename from src/app/components/shared/create-project/create-project.component.scss
rename to src/app/modules/project-management/components/create-project/create-project.component.scss
diff --git a/src/app/components/shared/create-project/create-project.component.spec.ts b/src/app/modules/project-management/components/create-project/create-project.component.spec.ts
similarity index 97%
rename from src/app/components/shared/create-project/create-project.component.spec.ts
rename to src/app/modules/project-management/components/create-project/create-project.component.spec.ts
index 3141b587c..9bb897869 100644
--- a/src/app/components/shared/create-project/create-project.component.spec.ts
+++ b/src/app/modules/project-management/components/create-project/create-project.component.spec.ts
@@ -1,8 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { CreateProjectComponent } from './create-project.component';
-import { Validators, FormBuilder } from '@angular/forms';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 describe('CreateProjectComponent', () => {
   let component: CreateProjectComponent;
diff --git a/src/app/components/shared/create-project/create-project.component.ts b/src/app/modules/project-management/components/create-project/create-project.component.ts
similarity index 80%
rename from src/app/components/shared/create-project/create-project.component.ts
rename to src/app/modules/project-management/components/create-project/create-project.component.ts
index 366cec638..79b622a43 100644
--- a/src/app/components/shared/create-project/create-project.component.ts
+++ b/src/app/modules/project-management/components/create-project/create-project.component.ts
@@ -1,15 +1,19 @@
-import { Component, OnInit, Input, SimpleChanges } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnChanges,
+  Output,
+  EventEmitter
+} from '@angular/core';
 import { FormBuilder, Validators } from '@angular/forms';
-import { Project } from '../../../interfaces';
-import { Output, EventEmitter } from '@angular/core';
-import { ProjectListComponent } from '../project-list/project-list.component';
+import { Project } from '../../../shared/models';
 
 @Component({
   selector: 'app-create-project',
   templateUrl: './create-project.component.html',
   styleUrls: ['./create-project.component.scss']
 })
-export class CreateProjectComponent implements OnInit {
+export class CreateProjectComponent implements OnChanges {
 
   projectForm;
   editProjectId;
@@ -28,9 +32,6 @@ export class CreateProjectComponent implements OnInit {
     });
   }
 
-  ngOnInit(): void {
-  }
-
   ngOnChanges(): void {
     if (this.projectToEdit) {
       this.editProjectId = this.projectToEdit.id;
diff --git a/src/app/modules/project-management/components/index.ts b/src/app/modules/project-management/components/index.ts
new file mode 100644
index 000000000..4ffcb2ee5
--- /dev/null
+++ b/src/app/modules/project-management/components/index.ts
@@ -0,0 +1,2 @@
+export * from './create-project/create-project.component';
+export * from './project-list/project-list.component';
diff --git a/src/app/components/shared/project-list/project-list.component.html b/src/app/modules/project-management/components/project-list/project-list.component.html
similarity index 84%
rename from src/app/components/shared/project-list/project-list.component.html
rename to src/app/modules/project-management/components/project-list/project-list.component.html
index c7935adec..e89f60631 100644
--- a/src/app/components/shared/project-list/project-list.component.html
+++ b/src/app/modules/project-management/components/project-list/project-list.component.html
@@ -28,19 +28,14 @@ <h5>Completed project:</h5>
         </div>
       </div>
       <ng-template #notShow>
-        <div class="card">
-          <div class="card-body">
-            <h4 class="card-text">There is no any project.</h4>
-            <h5 class="card-text">Please, create one.</h5>
-          </div>
-        </div>
+        <app-empty-state></app-empty-state>
       </ng-template>
     </div>
   </div>
 </div>
 
 <app-modal *ngIf = "openDeleteModal" class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-hidden="true"
-[list] = "projectToDelete"
-(removeList) = "removeProject($event)"
+  [list] = "projectToDelete"
+  (removeList) = "removeProject($event)"
 >
 </app-modal>
diff --git a/src/app/components/shared/project-list/project-list.component.scss b/src/app/modules/project-management/components/project-list/project-list.component.scss
similarity index 100%
rename from src/app/components/shared/project-list/project-list.component.scss
rename to src/app/modules/project-management/components/project-list/project-list.component.scss
diff --git a/src/app/components/shared/project-list/project-list.component.spec.ts b/src/app/modules/project-management/components/project-list/project-list.component.spec.ts
similarity index 100%
rename from src/app/components/shared/project-list/project-list.component.spec.ts
rename to src/app/modules/project-management/components/project-list/project-list.component.spec.ts
diff --git a/src/app/components/shared/project-list/project-list.component.ts b/src/app/modules/project-management/components/project-list/project-list.component.ts
similarity index 73%
rename from src/app/components/shared/project-list/project-list.component.ts
rename to src/app/modules/project-management/components/project-list/project-list.component.ts
index 2a9289f78..047b981e3 100644
--- a/src/app/components/shared/project-list/project-list.component.ts
+++ b/src/app/modules/project-management/components/project-list/project-list.component.ts
@@ -1,7 +1,11 @@
-import { Component, OnInit } from '@angular/core';
-import { Input } from '@angular/core';
-import { Output, EventEmitter } from '@angular/core';
-import { Project } from '../../../interfaces';
+import {
+  Component,
+  OnInit,
+  Input,
+  Output,
+  EventEmitter
+} from '@angular/core';
+import { Project } from '../../../shared/models';
 
 @Component({
   selector: 'app-project-list',
@@ -15,7 +19,7 @@ export class ProjectListComponent implements OnInit {
   @Output() deleteProject = new EventEmitter();
 
   projectToDelete: Project;
-  openDeleteModal: Boolean = false;
+  openDeleteModal = false;
 
   constructor() { }
 
diff --git a/src/app/components/shared/modal/modal.component.scss b/src/app/modules/project-management/models/.gitkeep
similarity index 100%
rename from src/app/components/shared/modal/modal.component.scss
rename to src/app/modules/project-management/models/.gitkeep
diff --git a/src/app/modules/project-management/pages/project-management.component.html b/src/app/modules/project-management/pages/project-management.component.html
new file mode 100644
index 000000000..5ad9c163f
--- /dev/null
+++ b/src/app/modules/project-management/pages/project-management.component.html
@@ -0,0 +1,17 @@
+<div class="parent">
+  <app-create-project
+    class="item"
+    [projectToEdit]="project"
+    (savedProject)="updateProject($event)"
+    (cancelForm)="cancelForm()"
+  >
+  </app-create-project>
+
+  <app-project-list
+    class="item"
+    [projects]="projects"
+    (editProject)="editProject($event)"
+    (deleteProject)="deleteProject($event)"
+  >
+  </app-project-list>
+</div>
diff --git a/src/app/components/options-sidebar/project-management/project-management.component.scss b/src/app/modules/project-management/pages/project-management.component.scss
similarity index 100%
rename from src/app/components/options-sidebar/project-management/project-management.component.scss
rename to src/app/modules/project-management/pages/project-management.component.scss
diff --git a/src/app/components/options-sidebar/project-management/project-management.component.spec.ts b/src/app/modules/project-management/pages/project-management.component.spec.ts
similarity index 92%
rename from src/app/components/options-sidebar/project-management/project-management.component.spec.ts
rename to src/app/modules/project-management/pages/project-management.component.spec.ts
index 642bcb2fa..6caae8b40 100644
--- a/src/app/components/options-sidebar/project-management/project-management.component.spec.ts
+++ b/src/app/modules/project-management/pages/project-management.component.spec.ts
@@ -1,12 +1,11 @@
 import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { of } from 'rxjs';
 
+import { CreateProjectComponent, ProjectListComponent } from '../components';
+import { Project } from '../../shared/models';
 import { ProjectManagementComponent } from './project-management.component';
-import { Project } from '../../../interfaces';
-import { ProjectService } from '../../../services/project.service';
-import { of } from 'rxjs';
-import { CreateProjectComponent } from '../../../components/shared/create-project/create-project.component';
-import { ProjectListComponent } from '../../../components/shared/project-list/project-list.component';
+import { ProjectService } from '../services/project.service';
 
 describe('ProjectManagementComponent', () => {
   let component: ProjectManagementComponent;
diff --git a/src/app/components/options-sidebar/project-management/project-management.component.ts b/src/app/modules/project-management/pages/project-management.component.ts
similarity index 93%
rename from src/app/components/options-sidebar/project-management/project-management.component.ts
rename to src/app/modules/project-management/pages/project-management.component.ts
index 769e85cc4..600ddffc8 100644
--- a/src/app/components/options-sidebar/project-management/project-management.component.ts
+++ b/src/app/modules/project-management/pages/project-management.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Project } from '../../../interfaces';
-import { ProjectService } from '../../../services/project.service';
+import { Project } from '../../shared/models';
+import { ProjectService } from '../services/project.service';
 
 @Component({
   selector: 'app-project-management',
diff --git a/src/app/services/project.service.spec.ts b/src/app/modules/project-management/services/project.service.spec.ts
similarity index 89%
rename from src/app/services/project.service.spec.ts
rename to src/app/modules/project-management/services/project.service.spec.ts
index 6e36e632b..5e8fb3c03 100644
--- a/src/app/services/project.service.spec.ts
+++ b/src/app/modules/project-management/services/project.service.spec.ts
@@ -1,13 +1,13 @@
-import { TestBed, inject, async } from '@angular/core/testing';
+import { TestBed, inject } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { Project } from '../interfaces';
+import { Project } from '../../shared/models';
 import { ProjectService } from './project.service';
 
 describe('ProjectService', () => {
   let service: ProjectService;
   let httpMock: HttpTestingController;
 
-  const projects: Project[] = [{
+  const projectsList: Project[] = [{
     id: '1',
     name: 'app 1',
     details: 'It is a good app',
@@ -55,7 +55,7 @@ describe('ProjectService', () => {
     });
     const request = httpMock.expectOne('assets/project.json');
     expect(request.request.method).toBe('GET');
-    request.flush(projects);
+    request.flush(projectsList);
     });
 
 });
diff --git a/src/app/services/project.service.ts b/src/app/modules/project-management/services/project.service.ts
similarity index 89%
rename from src/app/services/project.service.ts
rename to src/app/modules/project-management/services/project.service.ts
index 3e04f2862..aec99ad4f 100644
--- a/src/app/services/project.service.ts
+++ b/src/app/modules/project-management/services/project.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Project } from '../interfaces';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { Project } from '../../shared/models';
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/components/shared/navbar/navbar.component.scss b/src/app/modules/project-management/store/.gitkeep
similarity index 100%
rename from src/app/components/shared/navbar/navbar.component.scss
rename to src/app/modules/project-management/store/.gitkeep
diff --git a/src/app/modules/reports/components/.gitkeep b/src/app/modules/reports/components/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modules/reports/models/.gitkeep b/src/app/modules/reports/models/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modules/reports/pages/reports.component.html b/src/app/modules/reports/pages/reports.component.html
new file mode 100644
index 000000000..cddaf3719
--- /dev/null
+++ b/src/app/modules/reports/pages/reports.component.html
@@ -0,0 +1,3 @@
+<div class="text-center mt-5">
+  <p>reports works!</p>
+</div>
diff --git a/src/app/modules/reports/pages/reports.component.scss b/src/app/modules/reports/pages/reports.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/options-sidebar/reports/reports.component.spec.ts b/src/app/modules/reports/pages/reports.component.spec.ts
similarity index 99%
rename from src/app/components/options-sidebar/reports/reports.component.spec.ts
rename to src/app/modules/reports/pages/reports.component.spec.ts
index f2f2f33e7..a962c9d12 100644
--- a/src/app/components/options-sidebar/reports/reports.component.spec.ts
+++ b/src/app/modules/reports/pages/reports.component.spec.ts
@@ -39,4 +39,4 @@ describe('ReportsComponent', () => {
     expect(ptag.textContent).toBe('reports works!');
   }));
 
-});
\ No newline at end of file
+});
diff --git a/src/app/components/options-sidebar/reports/reports.component.ts b/src/app/modules/reports/pages/reports.component.ts
similarity index 100%
rename from src/app/components/options-sidebar/reports/reports.component.ts
rename to src/app/modules/reports/pages/reports.component.ts
diff --git a/src/app/modules/reports/services/.gitkeep b/src/app/modules/reports/services/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modules/reports/store/.gitkeep b/src/app/modules/reports/store/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/shared/clock/clock.component.html b/src/app/modules/shared/components/clock/clock.component.html
similarity index 100%
rename from src/app/components/shared/clock/clock.component.html
rename to src/app/modules/shared/components/clock/clock.component.html
diff --git a/src/app/components/shared/clock/clock.component.scss b/src/app/modules/shared/components/clock/clock.component.scss
similarity index 51%
rename from src/app/components/shared/clock/clock.component.scss
rename to src/app/modules/shared/components/clock/clock.component.scss
index 95c9b0894..73f372045 100644
--- a/src/app/components/shared/clock/clock.component.scss
+++ b/src/app/modules/shared/components/clock/clock.component.scss
@@ -1,3 +1,3 @@
 .time-clock-color {
-    color: white;
-}
\ No newline at end of file
+  color: white;
+}
diff --git a/src/app/components/shared/clock/clock.component.spec.ts b/src/app/modules/shared/components/clock/clock.component.spec.ts
similarity index 96%
rename from src/app/components/shared/clock/clock.component.spec.ts
rename to src/app/modules/shared/components/clock/clock.component.spec.ts
index 22f10997f..73172557f 100644
--- a/src/app/components/shared/clock/clock.component.spec.ts
+++ b/src/app/modules/shared/components/clock/clock.component.spec.ts
@@ -1,7 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ClockComponent } from './clock.component';
-import { interval, timer, of } from 'rxjs';
 
 describe('ClockComponent', () => {
   let component: ClockComponent;
diff --git a/src/app/components/shared/clock/clock.component.ts b/src/app/modules/shared/components/clock/clock.component.ts
similarity index 95%
rename from src/app/components/shared/clock/clock.component.ts
rename to src/app/modules/shared/components/clock/clock.component.ts
index ac956ae05..e8598ca05 100644
--- a/src/app/components/shared/clock/clock.component.ts
+++ b/src/app/modules/shared/components/clock/clock.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { interval, timer } from 'rxjs';
+import { interval } from 'rxjs';
 
 @Component({
   selector: 'app-clock',
diff --git a/src/app/components/shared/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html
similarity index 100%
rename from src/app/components/shared/details-fields/details-fields.component.html
rename to src/app/modules/shared/components/details-fields/details-fields.component.html
diff --git a/src/app/components/shared/details-fields/details-fields.component.scss b/src/app/modules/shared/components/details-fields/details-fields.component.scss
similarity index 100%
rename from src/app/components/shared/details-fields/details-fields.component.scss
rename to src/app/modules/shared/components/details-fields/details-fields.component.scss
diff --git a/src/app/components/shared/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts
similarity index 99%
rename from src/app/components/shared/details-fields/details-fields.component.spec.ts
rename to src/app/modules/shared/components/details-fields/details-fields.component.spec.ts
index 7d7c2019d..b854e6794 100644
--- a/src/app/components/shared/details-fields/details-fields.component.spec.ts
+++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts
@@ -12,7 +12,7 @@ describe('DetailsFieldsComponent', () => {
     ticket: '',
     technology: '',
     comments: ''
-  }
+  };
 
   const newData = {
     project: 'Ernst&Young',
@@ -20,7 +20,7 @@ describe('DetailsFieldsComponent', () => {
     ticket: 'WA-15',
     technology: 'Angular',
     comments: 'No notes'
-  }
+  };
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
diff --git a/src/app/components/shared/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts
similarity index 84%
rename from src/app/components/shared/details-fields/details-fields.component.ts
rename to src/app/modules/shared/components/details-fields/details-fields.component.ts
index efa70b610..159328b3d 100644
--- a/src/app/components/shared/details-fields/details-fields.component.ts
+++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts
@@ -1,4 +1,12 @@
-import { Component, OnInit, Input, Output, EventEmitter, ViewChild, ElementRef } from '@angular/core';
+import {
+  Component,
+  OnChanges,
+  Input,
+  Output,
+  EventEmitter,
+  ViewChild,
+  ElementRef
+} from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 
 @Component({
@@ -6,7 +14,7 @@ import { FormBuilder, FormGroup } from '@angular/forms';
   templateUrl: './details-fields.component.html',
   styleUrls: ['./details-fields.component.scss']
 })
-export class DetailsFieldsComponent implements OnInit {
+export class DetailsFieldsComponent implements OnChanges {
   @Input() entryToEdit;
   @Input() formType: string;
   @Output() saveEntry = new EventEmitter();
@@ -23,8 +31,6 @@ export class DetailsFieldsComponent implements OnInit {
     });
   }
 
-  ngOnInit(): void { }
-
   ngOnChanges(): void {
     if (this.entryToEdit) {
       this.entryForm.setValue({
diff --git a/src/app/components/shared/empty-state/empty-state.component.html b/src/app/modules/shared/components/empty-state/empty-state.component.html
similarity index 100%
rename from src/app/components/shared/empty-state/empty-state.component.html
rename to src/app/modules/shared/components/empty-state/empty-state.component.html
diff --git a/src/app/components/shared/empty-state/empty-state.component.scss b/src/app/modules/shared/components/empty-state/empty-state.component.scss
similarity index 100%
rename from src/app/components/shared/empty-state/empty-state.component.scss
rename to src/app/modules/shared/components/empty-state/empty-state.component.scss
diff --git a/src/app/components/shared/empty-state/empty-state.component.spec.ts b/src/app/modules/shared/components/empty-state/empty-state.component.spec.ts
similarity index 100%
rename from src/app/components/shared/empty-state/empty-state.component.spec.ts
rename to src/app/modules/shared/components/empty-state/empty-state.component.spec.ts
diff --git a/src/app/components/shared/empty-state/empty-state.component.ts b/src/app/modules/shared/components/empty-state/empty-state.component.ts
similarity index 100%
rename from src/app/components/shared/empty-state/empty-state.component.ts
rename to src/app/modules/shared/components/empty-state/empty-state.component.ts
diff --git a/src/app/modules/shared/components/index.ts b/src/app/modules/shared/components/index.ts
new file mode 100644
index 000000000..14c165828
--- /dev/null
+++ b/src/app/modules/shared/components/index.ts
@@ -0,0 +1,8 @@
+export * from './clock/clock.component';
+export * from './details-fields/details-fields.component';
+export * from './empty-state/empty-state.component';
+export * from './modal/modal.component';
+export * from './month-picker/month-picker.component';
+export * from './navbar/navbar.component';
+export * from './sidebar/sidebar.component';
+export * from './user/user.component';
diff --git a/src/app/components/shared/modal/modal.component.html b/src/app/modules/shared/components/modal/modal.component.html
similarity index 100%
rename from src/app/components/shared/modal/modal.component.html
rename to src/app/modules/shared/components/modal/modal.component.html
diff --git a/src/app/modules/shared/components/modal/modal.component.scss b/src/app/modules/shared/components/modal/modal.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/shared/modal/modal.component.spec.ts b/src/app/modules/shared/components/modal/modal.component.spec.ts
similarity index 100%
rename from src/app/components/shared/modal/modal.component.spec.ts
rename to src/app/modules/shared/components/modal/modal.component.spec.ts
diff --git a/src/app/components/shared/modal/modal.component.ts b/src/app/modules/shared/components/modal/modal.component.ts
similarity index 92%
rename from src/app/components/shared/modal/modal.component.ts
rename to src/app/modules/shared/components/modal/modal.component.ts
index 01cb926ad..3e9449851 100644
--- a/src/app/components/shared/modal/modal.component.ts
+++ b/src/app/modules/shared/components/modal/modal.component.ts
@@ -7,7 +7,7 @@ import {
   Output,
   Input
 } from '@angular/core';
-import { Project, Entry } from '../../../interfaces'
+import { Project, Entry } from '../../models';
 
 @Component({
   selector: 'app-modal',
diff --git a/src/app/components/shared/month-picker/month-picker.component.html b/src/app/modules/shared/components/month-picker/month-picker.component.html
similarity index 100%
rename from src/app/components/shared/month-picker/month-picker.component.html
rename to src/app/modules/shared/components/month-picker/month-picker.component.html
diff --git a/src/app/components/shared/month-picker/month-picker.component.scss b/src/app/modules/shared/components/month-picker/month-picker.component.scss
similarity index 100%
rename from src/app/components/shared/month-picker/month-picker.component.scss
rename to src/app/modules/shared/components/month-picker/month-picker.component.scss
diff --git a/src/app/components/shared/month-picker/month-picker.component.spec.ts b/src/app/modules/shared/components/month-picker/month-picker.component.spec.ts
similarity index 100%
rename from src/app/components/shared/month-picker/month-picker.component.spec.ts
rename to src/app/modules/shared/components/month-picker/month-picker.component.spec.ts
diff --git a/src/app/components/shared/month-picker/month-picker.component.ts b/src/app/modules/shared/components/month-picker/month-picker.component.ts
similarity index 100%
rename from src/app/components/shared/month-picker/month-picker.component.ts
rename to src/app/modules/shared/components/month-picker/month-picker.component.ts
diff --git a/src/app/modules/shared/components/navbar/navbar.component.html b/src/app/modules/shared/components/navbar/navbar.component.html
new file mode 100644
index 000000000..0f28be942
--- /dev/null
+++ b/src/app/modules/shared/components/navbar/navbar.component.html
@@ -0,0 +1,8 @@
+<nav class="navbar navbar-dark bg-dark">
+  <a class="navbar-brand" href="#">
+    <img src="assets/img/ioet.png" width="20" height="35" class="d-inline-block align-top" alt="">
+  </a>
+
+  <app-clock class="text-center"></app-clock>
+  <app-user></app-user>
+</nav>
diff --git a/src/app/modules/shared/components/navbar/navbar.component.scss b/src/app/modules/shared/components/navbar/navbar.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/shared/navbar/navbar.component.spec.ts b/src/app/modules/shared/components/navbar/navbar.component.spec.ts
similarity index 100%
rename from src/app/components/shared/navbar/navbar.component.spec.ts
rename to src/app/modules/shared/components/navbar/navbar.component.spec.ts
diff --git a/src/app/components/shared/navbar/navbar.component.ts b/src/app/modules/shared/components/navbar/navbar.component.ts
similarity index 100%
rename from src/app/components/shared/navbar/navbar.component.ts
rename to src/app/modules/shared/components/navbar/navbar.component.ts
diff --git a/src/app/modules/shared/components/sidebar/sidebar.component.html b/src/app/modules/shared/components/sidebar/sidebar.component.html
new file mode 100644
index 000000000..6ba06bcd9
--- /dev/null
+++ b/src/app/modules/shared/components/sidebar/sidebar.component.html
@@ -0,0 +1,26 @@
+<div class="d-flex" id="wrapper">
+  <!-- Sidebar -->
+  <div class="bg-light border-right" id="sidebar-wrapper">
+    <div class="list-group list-group-flush">
+      <a [routerLink]="['/time-clock']" routerLinkActive="dark"
+        class="list-group-item list-group-item-action bg-light"><i class="far fa-clock"></i> Time Clock</a>
+      <a [routerLink]="['/time-entries']" routerLinkActive="dark"
+        class="list-group-item list-group-item-action bg-light"><i class="far fa-list-alt"></i> Time Entries</a>
+      <a [routerLink]="['/reports']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i
+          class="fas fa-chart-pie"></i> Reports</a>
+      <a [routerLink]="['/project-management']" routerLinkActive="dark"
+        class="list-group-item list-group-item-action bg-light"><i class="far fa-folder-open"></i> Projects</a>
+      <a [routerLink]="['/activities-management']" routerLinkActive="dark"
+        class="list-group-item list-group-item-action bg-light"><i class="far fa-file-alt"></i> Activities</a>
+    </div>
+  </div>
+  <!-- /#sidebar-wrapper -->
+
+  <!-- Page Content -->
+  <div class="container">
+    <router-outlet></router-outlet>
+  </div>
+  <!-- /#page-content-wrapper -->
+
+</div>
+<!-- /#wrapper -->
diff --git a/src/app/modules/shared/components/sidebar/sidebar.component.scss b/src/app/modules/shared/components/sidebar/sidebar.component.scss
new file mode 100644
index 000000000..3165ed4a1
--- /dev/null
+++ b/src/app/modules/shared/components/sidebar/sidebar.component.scss
@@ -0,0 +1,42 @@
+body {
+  overflow-x: hidden;
+}
+
+#sidebar-wrapper {
+  min-height: 100vh;
+  margin-left: -15rem;
+  -webkit-transition: margin .25s ease-out;
+  -moz-transition: margin .25s ease-out;
+  -o-transition: margin .25s ease-out;
+  transition: margin .25s ease-out;
+}
+
+#sidebar-wrapper .sidebar-heading {
+  padding: 0.875rem 1.25rem;
+  font-size: 1.2rem;
+}
+
+#sidebar-wrapper .list-group {
+  width: 15rem;
+}
+
+#page-content-wrapper {
+  min-width: 100vw;
+}
+
+#wrapper.toggled #sidebar-wrapper {
+  margin-left: 0;
+}
+
+@media (min-width: 768px) {
+  #sidebar-wrapper {
+    margin-left: 0;
+  }
+  #page-content-wrapper {
+    min-width: 0;
+    width: 100%;
+  }
+  #wrapper.toggled #sidebar-wrapper {
+    margin-left: -15rem;
+  }
+}
diff --git a/src/app/components/shared/sidebar/sidebar.component.spec.ts b/src/app/modules/shared/components/sidebar/sidebar.component.spec.ts
similarity index 100%
rename from src/app/components/shared/sidebar/sidebar.component.spec.ts
rename to src/app/modules/shared/components/sidebar/sidebar.component.spec.ts
diff --git a/src/app/components/shared/sidebar/sidebar.component.ts b/src/app/modules/shared/components/sidebar/sidebar.component.ts
similarity index 100%
rename from src/app/components/shared/sidebar/sidebar.component.ts
rename to src/app/modules/shared/components/sidebar/sidebar.component.ts
diff --git a/src/app/modules/shared/components/user/user.component.html b/src/app/modules/shared/components/user/user.component.html
new file mode 100644
index 000000000..76fed457e
--- /dev/null
+++ b/src/app/modules/shared/components/user/user.component.html
@@ -0,0 +1,19 @@
+<div>
+  <a
+    class="nav-link dropdown-toggle help-color"
+    id="navbarDropdown"
+    role="button"
+    data-toggle="dropdown"
+    aria-haspopup="true"
+    aria-expanded="false"
+  >
+    <i class="far fa-user-circle"></i> Dario Herrera
+  </a>
+
+  <div
+    class="dropdown-menu dropdown-menu-right"
+    aria-labelledby="navbarDropdown"
+  >
+    <a class="dropdown-item">Sign Out</a>
+  </div>
+</div>
diff --git a/src/app/components/shared/user/user.component.scss b/src/app/modules/shared/components/user/user.component.scss
similarity index 75%
rename from src/app/components/shared/user/user.component.scss
rename to src/app/modules/shared/components/user/user.component.scss
index c67d606bb..60a21fecc 100644
--- a/src/app/components/shared/user/user.component.scss
+++ b/src/app/modules/shared/components/user/user.component.scss
@@ -1,5 +1,5 @@
 .help-color {
-    color: white;
+  color: white;
 }
 
 .dropdown-menu {
diff --git a/src/app/components/shared/user/user.component.spec.ts b/src/app/modules/shared/components/user/user.component.spec.ts
similarity index 100%
rename from src/app/components/shared/user/user.component.spec.ts
rename to src/app/modules/shared/components/user/user.component.spec.ts
diff --git a/src/app/components/shared/user/user.component.ts b/src/app/modules/shared/components/user/user.component.ts
similarity index 100%
rename from src/app/components/shared/user/user.component.ts
rename to src/app/modules/shared/components/user/user.component.ts
diff --git a/src/app/interfaces/entry.ts b/src/app/modules/shared/models/entry.model.ts
similarity index 100%
rename from src/app/interfaces/entry.ts
rename to src/app/modules/shared/models/entry.model.ts
diff --git a/src/app/modules/shared/models/index.ts b/src/app/modules/shared/models/index.ts
new file mode 100644
index 000000000..533725a86
--- /dev/null
+++ b/src/app/modules/shared/models/index.ts
@@ -0,0 +1,2 @@
+export * from './project.model';
+export * from './entry.model';
diff --git a/src/app/interfaces/project.ts b/src/app/modules/shared/models/project.model.ts
similarity index 100%
rename from src/app/interfaces/project.ts
rename to src/app/modules/shared/models/project.model.ts
diff --git a/src/app/components/shared/pipes/group-by-date/group-by-date.pipe.spec.ts b/src/app/modules/shared/pipes/group-by-date/group-by-date.pipe.spec.ts
similarity index 100%
rename from src/app/components/shared/pipes/group-by-date/group-by-date.pipe.spec.ts
rename to src/app/modules/shared/pipes/group-by-date/group-by-date.pipe.spec.ts
diff --git a/src/app/components/shared/pipes/group-by-date/group-by-date.pipe.ts b/src/app/modules/shared/pipes/group-by-date/group-by-date.pipe.ts
similarity index 75%
rename from src/app/components/shared/pipes/group-by-date/group-by-date.pipe.ts
rename to src/app/modules/shared/pipes/group-by-date/group-by-date.pipe.ts
index 5c9346750..ecdbf4c80 100644
--- a/src/app/components/shared/pipes/group-by-date/group-by-date.pipe.ts
+++ b/src/app/modules/shared/pipes/group-by-date/group-by-date.pipe.ts
@@ -15,17 +15,17 @@ export class GroupByDatePipe implements PipeTransform {
       const endDate = this.getDate(current.endDate);
       const startDate = this.getDate(current.startDate);
 
-      if (!previous[endDate]) previous[endDate] = [];
-      if (!previous[startDate]) previous[startDate] = []
+      if (!previous[endDate]) { previous[endDate] = []; }
+      if (!previous[startDate]) { previous[startDate] = []; }
 
-      if (startDate !== endDate) previous[startDate].push(current);
+      if (startDate !== endDate) { previous[startDate].push(current); }
       previous[endDate].push(current);
 
       return previous;
     }, {});
 
     return Object.keys(newGroup).map(date => ({
-      date: date,
+      date,
       details: newGroup[date]
     }));
   }
diff --git a/src/app/modules/shared/pipes/index.ts b/src/app/modules/shared/pipes/index.ts
new file mode 100644
index 000000000..ee3b350d2
--- /dev/null
+++ b/src/app/modules/shared/pipes/index.ts
@@ -0,0 +1 @@
+export * from './group-by-date/group-by-date.pipe';
diff --git a/src/app/modules/time-clock/components/index.ts b/src/app/modules/time-clock/components/index.ts
new file mode 100644
index 000000000..0d1951b02
--- /dev/null
+++ b/src/app/modules/time-clock/components/index.ts
@@ -0,0 +1 @@
+export * from './project-list-hover/project-list-hover.component';
diff --git a/src/app/components/shared/project-list-hover/project-list-hover.component.html b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html
similarity index 100%
rename from src/app/components/shared/project-list-hover/project-list-hover.component.html
rename to src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html
diff --git a/src/app/components/shared/project-list-hover/project-list-hover.component.scss b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.scss
similarity index 100%
rename from src/app/components/shared/project-list-hover/project-list-hover.component.scss
rename to src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.scss
diff --git a/src/app/components/shared/project-list-hover/project-list-hover.component.spec.ts b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts
similarity index 64%
rename from src/app/components/shared/project-list-hover/project-list-hover.component.spec.ts
rename to src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts
index 85024d03a..9b097131e 100644
--- a/src/app/components/shared/project-list-hover/project-list-hover.component.spec.ts
+++ b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts
@@ -1,8 +1,8 @@
-import { async, ComponentFixture, TestBed } from "@angular/core/testing";
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ProjectListHoverComponent } from "./project-list-hover.component";
+import { ProjectListHoverComponent } from './project-list-hover.component';
 
-describe("ProjectListHoverComponent", () => {
+describe('ProjectListHoverComponent', () => {
   let component: ProjectListHoverComponent;
   let fixture: ComponentFixture<ProjectListHoverComponent>;
 
@@ -18,18 +18,18 @@ describe("ProjectListHoverComponent", () => {
     fixture.detectChanges();
   });
 
-  it("should create", () => {
+  it('should create', () => {
     expect(component).toBeTruthy();
   });
 
-  it("should set selectedId with Id", () => {
-    const id: string = "P1";
+  it('should set selectedId with Id', () => {
+    const id = 'P1';
     component.clockIn(id);
     expect(component.selectedId).toBe(id);
   });
 
-  it("should emit showFields event", () => {
-    const id: string = "P1";
+  it('should emit showFields event', () => {
+    const id = 'P1';
     component.showFields.subscribe((showFields: boolean) =>
       expect(showFields).toEqual(true)
     );
diff --git a/src/app/components/shared/project-list-hover/project-list-hover.component.ts b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts
similarity index 61%
rename from src/app/components/shared/project-list-hover/project-list-hover.component.ts
rename to src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts
index f3626d6da..df6c79908 100644
--- a/src/app/components/shared/project-list-hover/project-list-hover.component.ts
+++ b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 
 @Component({
-  selector: "app-project-list-hover",
-  templateUrl: "./project-list-hover.component.html",
-  styleUrls: ["./project-list-hover.component.scss"]
+  selector: 'app-project-list-hover',
+  templateUrl: './project-list-hover.component.html',
+  styleUrls: ['./project-list-hover.component.scss']
 })
 export class ProjectListHoverComponent implements OnInit {
   @Input() projects: any;
diff --git a/src/app/modules/time-clock/models/.gitkeep b/src/app/modules/time-clock/models/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/options-sidebar/time-clock/time-clock.component.html b/src/app/modules/time-clock/pages/time-clock.component.html
similarity index 100%
rename from src/app/components/options-sidebar/time-clock/time-clock.component.html
rename to src/app/modules/time-clock/pages/time-clock.component.html
diff --git a/src/app/modules/time-clock/pages/time-clock.component.scss b/src/app/modules/time-clock/pages/time-clock.component.scss
new file mode 100644
index 000000000..0e808f74e
--- /dev/null
+++ b/src/app/modules/time-clock/pages/time-clock.component.scss
@@ -0,0 +1,10 @@
+.content-ClockIn {
+  padding: 2.1rem 1rem;
+}
+
+.timer {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  justify-content: center;
+}
diff --git a/src/app/components/options-sidebar/time-clock/time-clock.component.spec.ts b/src/app/modules/time-clock/pages/time-clock.component.spec.ts
similarity index 65%
rename from src/app/components/options-sidebar/time-clock/time-clock.component.spec.ts
rename to src/app/modules/time-clock/pages/time-clock.component.spec.ts
index 829383ef8..22efae704 100644
--- a/src/app/components/options-sidebar/time-clock/time-clock.component.spec.ts
+++ b/src/app/modules/time-clock/pages/time-clock.component.spec.ts
@@ -1,8 +1,8 @@
-import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { DebugElement, Component } from '@angular/core';
 import { TimeClockComponent } from './time-clock.component';
-import { ProjectListHoverComponent } from '../../shared/project-list-hover/project-list-hover.component';
+import { ProjectListHoverComponent } from '../components';
 
 describe('TimeClockComponent', () => {
   let component: TimeClockComponent;
@@ -66,62 +66,60 @@ describe('TimeClockComponent', () => {
     expect(component.hour).toEqual(0);
     expect(component.minute).toEqual(0);
     expect(component.seconds).toEqual(0);
-    });
+  });
 
   it('should be change state of isClockInEnale, isClockIn, isHidenForm when function is called' , () => {
-      component.employeClockIn();
-      expect(component.isClockInEnable).toBeTruthy();
-      expect(component.isClockIn).toBeFalsy();
-    });
+    component.employeClockIn();
+    expect(component.isClockInEnable).toBeTruthy();
+    expect(component.isClockIn).toBeFalsy();
+  });
 
   it('the function should return false' , () => {
-      expect(component.employeClockIn()).toEqual(false);
-    });
+    expect(component.employeClockIn()).toEqual(false);
+  });
 
   it('should be called to intern methods of employeClockIn' , () => {
-      spyOn(component, 'startTimer');
-      spyOn(component, 'setArrivalAndDepartureTimes');
+    spyOn(component, 'startTimer');
+    spyOn(component, 'setArrivalAndDepartureTimes');
 
-      component.employeClockIn();
+    component.employeClockIn();
 
-      expect(component.startTimer).toHaveBeenCalled();
-      expect(component.setArrivalAndDepartureTimes).toHaveBeenCalled();
-    });
+    expect(component.startTimer).toHaveBeenCalled();
+    expect(component.setArrivalAndDepartureTimes).toHaveBeenCalled();
+  });
 
-    /* ---------------------- EMPLOYE CLOCK OUT ------------------------------------- */
+  /* ---------------------- EMPLOYE CLOCK OUT ------------------------------------- */
   it('should enter if and assign the value to vars' , () => {
-      component.isEnterTechnology = false;
-      component.employeClockOut();
-      expect(component.isClockIn).toBeFalsy();
-      expect(component.showAlertEnterTecnology).toBeTruthy();
-    });
+    component.isEnterTechnology = false;
+    component.employeClockOut();
+    expect(component.isClockIn).toBeFalsy();
+    expect(component.showAlertEnterTecnology).toBeTruthy();
+  });
 
   it('should enter if and not called to intern methods' , () => {
-      component.isEnterTechnology = false;
-      spyOn(component, 'setDefaultValuesToFields');
-      spyOn(component, 'pauseTimer');
-      spyOn(component, 'setArrivalAndDepartureTimes');
-      component.employeClockOut();
-      expect(component.setDefaultValuesToFields).not.toHaveBeenCalled();
-      expect(component.pauseTimer).not.toHaveBeenCalled();
-      expect(component.setArrivalAndDepartureTimes).not.toHaveBeenCalled();
-
-    });
+    component.isEnterTechnology = false;
+    spyOn(component, 'setDefaultValuesToFields');
+    spyOn(component, 'pauseTimer');
+    spyOn(component, 'setArrivalAndDepartureTimes');
+    component.employeClockOut();
+    expect(component.setDefaultValuesToFields).not.toHaveBeenCalled();
+    expect(component.pauseTimer).not.toHaveBeenCalled();
+    expect(component.setArrivalAndDepartureTimes).not.toHaveBeenCalled();
+  });
 
   it('should enter else and execute internal methods' , () => {
-        component.isEnterTechnology = true;
-
-        spyOn(component, 'setDefaultValuesToFields');
-        spyOn(component, 'pauseTimer');
-        spyOn(component, 'setArrivalAndDepartureTimes');
+    component.isEnterTechnology = true;
 
-        component.employeClockOut();
+    spyOn(component, 'setDefaultValuesToFields');
+    spyOn(component, 'pauseTimer');
+    spyOn(component, 'setArrivalAndDepartureTimes');
 
-        expect(component.setDefaultValuesToFields).toHaveBeenCalled();
-        expect(component.pauseTimer).toHaveBeenCalled();
-        expect(component.setArrivalAndDepartureTimes).toHaveBeenCalled();
+    component.employeClockOut();
 
-    });
+    expect(component.setDefaultValuesToFields).toHaveBeenCalled();
+    expect(component.pauseTimer).toHaveBeenCalled();
+    expect(component.setArrivalAndDepartureTimes).toHaveBeenCalled();
+  });
 
 /* ---------------------- ENTER TECHNOLOGY ------------------------------------- */
   it('should enter if and assign the value to var' , () => {
@@ -191,23 +189,22 @@ describe('TimeClockComponent', () => {
     expect(component.setArrivalAndDepartureTimes).not.toHaveBeenCalled();
   });
 
-    /* ---------------------- TIMER ------------------------------------- */
+  /* ---------------------- TIMER ------------------------------------- */
   it('should be var not equal to zero' , () => {
-      component.timer();
-      expect(component.secondsCounterRealTime).not.toEqual(0);
-    });
+    component.timer();
+    expect(component.secondsCounterRealTime).not.toEqual(0);
+  });
 
-    /* ---------------------- ARRIVALS ------------------------------------- */
+  /* ---------------------- ARRIVALS ------------------------------------- */
   it('should execute intern methods of arrivals' , () => {
-      const currentDate = new Date();
-      component.execOnlyOneTimeClockIn = false;
-      component.setArrivalAndDepartureTimes();
-      expect(component.hour).toEqual(currentDate.getHours());
-      expect(component.minute).toEqual(currentDate.getMinutes());
-      expect(component.seconds).toEqual(currentDate.getSeconds());
-      expect(component.execOnlyOneTimeClockIn).toEqual(true);
-
-    });
+    const currentDate = new Date();
+    component.execOnlyOneTimeClockIn = false;
+    component.setArrivalAndDepartureTimes();
+    expect(component.hour).toEqual(currentDate.getHours());
+    expect(component.minute).toEqual(currentDate.getMinutes());
+    expect(component.seconds).toEqual(currentDate.getSeconds());
+    expect(component.execOnlyOneTimeClockIn).toEqual(true);
+  });
 
   it('should not execute intern methods of arrivals' , () => {
     component.execOnlyOneTimeClockIn = true;
@@ -216,20 +213,17 @@ describe('TimeClockComponent', () => {
     expect(component.minute).toEqual(0);
     expect(component.seconds).toEqual(0);
     expect(component.execOnlyOneTimeClockIn).toEqual(true);
-    });
+  });
 
-    /* ---------------------- DEFAULT FIELDS ------------------------------------- */
+  /* ---------------------- DEFAULT FIELDS ------------------------------------- */
   it('set values to empty' , () => {
-        component.setDefaultValuesToFields();
-        expect(component.isHidenForm).toBeTruthy();
-        expect(component.isClockIn).toBeTruthy();
-        expect(component.isEnterTechnology).toBeFalsy();
-        expect(component.showAlertEnterTecnology).toBeFalsy();
-        expect(component.execOnlyOneTimeClockIn).toBeFalsy();
-        expect(component.execOnlyOneTimeCounter).toBeFalsy();
-        expect(component.isClockInEnable).toBeFalsy();
-
-    });
+    component.setDefaultValuesToFields();
+    expect(component.isHidenForm).toBeTruthy();
+    expect(component.isClockIn).toBeTruthy();
+    expect(component.isEnterTechnology).toBeFalsy();
+    expect(component.showAlertEnterTecnology).toBeFalsy();
+    expect(component.execOnlyOneTimeClockIn).toBeFalsy();
+    expect(component.execOnlyOneTimeCounter).toBeFalsy();
+    expect(component.isClockInEnable).toBeFalsy();
+  });
 });
-
-
diff --git a/src/app/components/options-sidebar/time-clock/time-clock.component.ts b/src/app/modules/time-clock/pages/time-clock.component.ts
similarity index 100%
rename from src/app/components/options-sidebar/time-clock/time-clock.component.ts
rename to src/app/modules/time-clock/pages/time-clock.component.ts
diff --git a/src/app/modules/time-clock/services/.gitkeep b/src/app/modules/time-clock/services/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modules/time-clock/store/.gitkeep b/src/app/modules/time-clock/store/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modules/time-entries/components/.gitkeep b/src/app/modules/time-entries/components/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modules/time-entries/models/.gitkeep b/src/app/modules/time-entries/models/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/options-sidebar/time-entries/time-entries.component.html b/src/app/modules/time-entries/pages/time-entries.component.html
similarity index 100%
rename from src/app/components/options-sidebar/time-entries/time-entries.component.html
rename to src/app/modules/time-entries/pages/time-entries.component.html
diff --git a/src/app/components/options-sidebar/time-entries/time-entries.component.scss b/src/app/modules/time-entries/pages/time-entries.component.scss
similarity index 77%
rename from src/app/components/options-sidebar/time-entries/time-entries.component.scss
rename to src/app/modules/time-entries/pages/time-entries.component.scss
index 4b6e05eb5..78ffafc56 100644
--- a/src/app/components/options-sidebar/time-entries/time-entries.component.scss
+++ b/src/app/modules/time-entries/pages/time-entries.component.scss
@@ -10,10 +10,10 @@
 .accordion-container {
   max-height: 25rem;
   overflow-y: auto;
-}
 
-.accordion-container::-webkit-scrollbar {
-  display: none;
+  &::-webkit-scrollbar {
+    display: none;
+  }
 }
 
 .date-header {
@@ -22,10 +22,10 @@
   border-bottom: 1px solid rgba(0, 0, 0, 0.125);
   font-size: small;
   padding: 0 0.9rem;
-}
 
-.date-header > a {
-  color: #000000;
+  a {
+    color: #000000;
+  }
 }
 
 .btn-small > i {
@@ -38,9 +38,9 @@
   border-bottom: 1px solid rgba(0, 0, 0, 0.125);
   display: flex;
   font-size: small;
-}
 
-.entries:hover {
-  background-color: #d5edf0;
-  cursor: pointer;
+  &:hover {
+    background-color: #d5edf0;
+    cursor: pointer;
+  }
 }
diff --git a/src/app/components/options-sidebar/time-entries/time-entries.component.spec.ts b/src/app/modules/time-entries/pages/time-entries.component.spec.ts
similarity index 85%
rename from src/app/components/options-sidebar/time-entries/time-entries.component.spec.ts
rename to src/app/modules/time-entries/pages/time-entries.component.spec.ts
index f673953d0..b80ba7d36 100644
--- a/src/app/components/options-sidebar/time-entries/time-entries.component.spec.ts
+++ b/src/app/modules/time-entries/pages/time-entries.component.spec.ts
@@ -1,12 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
+import {
+  MonthPickerComponent,
+  DetailsFieldsComponent,
+  EmptyStateComponent,
+  ModalComponent
+} from '../../shared/components';
+import { GroupByDatePipe } from '../../shared/pipes';
 import { TimeEntriesComponent } from './time-entries.component';
-import { GroupByDatePipe } from '../../shared/pipes/group-by-date/group-by-date.pipe';
-import { MonthPickerComponent } from '../../shared/month-picker/month-picker.component';
-import { DetailsFieldsComponent } from '../../shared/details-fields/details-fields.component';
-import { EmptyStateComponent } from '../../shared/empty-state/empty-state.component';
-import { ModalComponent } from '../../shared/modal/modal.component';
 
 describe('TimeEntriesComponent', () => {
   let component: TimeEntriesComponent;
@@ -69,7 +71,7 @@ describe('TimeEntriesComponent', () => {
   });
 
   it('should filter the Entry to edit', () => {
-    const entryId = "entry_1"
+    const entryId = 'entry_1';
     component.editEntry(entryId);
     expect(component.entry.project).toBe(entry.project);
     expect(component.entry.startDate).toBe(entry.startDate);
@@ -89,7 +91,7 @@ describe('TimeEntriesComponent', () => {
   });
 
   it('should delete a Entry', () => {
-    const entryId = "entry_2";
+    const entryId = 'entry_2';
     component.removeEntry(entryId);
     expect(component.dataByMonth.length).toBe(2);
   });
diff --git a/src/app/components/options-sidebar/time-entries/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts
similarity index 97%
rename from src/app/components/options-sidebar/time-entries/time-entries.component.ts
rename to src/app/modules/time-entries/pages/time-entries.component.ts
index 9d74f9212..e78076580 100644
--- a/src/app/components/options-sidebar/time-entries/time-entries.component.ts
+++ b/src/app/modules/time-entries/pages/time-entries.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Entry } from '../../../interfaces';
+import { Entry } from '../../shared/models';
 
 @Component({
   selector: 'app-time-entries',
@@ -8,7 +8,7 @@ import { Entry } from '../../../interfaces';
 })
 export class TimeEntriesComponent implements OnInit {
 
-  showModal: boolean = false;
+  showModal = false;
   entryId: string;
   entry: Entry;
   entryToDelete: Entry;
diff --git a/src/app/modules/time-entries/services/.gitkeep b/src/app/modules/time-entries/services/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modules/time-entries/store/.gitkeep b/src/app/modules/time-entries/store/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From fd04e9c0a8958fd985e25b54c887ace4472f614a Mon Sep 17 00:00:00 2001
From: Jorge Flores <jflores@ioet.com>
Date: Mon, 30 Mar 2020 10:42:15 -0500
Subject: [PATCH 2/2] #51 Fix comments

---
 .../components/activity-list/activity-list.component.ts        | 2 +-
 .../components/create-activity/create-activity.component.ts    | 2 +-
 src/app/modules/activities-management/models/.gitkeep          | 0
 src/app/modules/activities-management/models/index.ts          | 1 -
 .../pages/activities-management.component.spec.ts              | 2 +-
 .../pages/activities-management.component.ts                   | 2 +-
 .../activities-management/services/activity.service.spec.ts    | 2 +-
 .../modules/activities-management/services/activity.service.ts | 2 +-
 .../{activities-management => shared}/models/activity.model.ts | 0
 src/app/modules/shared/models/index.ts                         | 3 ++-
 10 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 src/app/modules/activities-management/models/.gitkeep
 delete mode 100644 src/app/modules/activities-management/models/index.ts
 rename src/app/modules/{activities-management => shared}/models/activity.model.ts (100%)

diff --git a/src/app/modules/activities-management/components/activity-list/activity-list.component.ts b/src/app/modules/activities-management/components/activity-list/activity-list.component.ts
index 652d7eee6..cb641d6e1 100644
--- a/src/app/modules/activities-management/components/activity-list/activity-list.component.ts
+++ b/src/app/modules/activities-management/components/activity-list/activity-list.component.ts
@@ -1,6 +1,6 @@
 import { Input } from '@angular/core';
 import { Component } from '@angular/core';
-import { Activity } from '../../models';
+import { Activity } from '../../../shared/models';
 
 @Component({
   selector: 'app-activity-list',
diff --git a/src/app/modules/activities-management/components/create-activity/create-activity.component.ts b/src/app/modules/activities-management/components/create-activity/create-activity.component.ts
index e93c748e8..0e5cf9f1b 100644
--- a/src/app/modules/activities-management/components/create-activity/create-activity.component.ts
+++ b/src/app/modules/activities-management/components/create-activity/create-activity.component.ts
@@ -1,6 +1,6 @@
 import { FormBuilder, Validators, FormGroup } from '@angular/forms';
 import { Component, Input } from '@angular/core';
-import { Activity } from '../../models';
+import { Activity } from '../../../shared/models';
 
 @Component({
   selector: 'app-create-activity',
diff --git a/src/app/modules/activities-management/models/.gitkeep b/src/app/modules/activities-management/models/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modules/activities-management/models/index.ts b/src/app/modules/activities-management/models/index.ts
deleted file mode 100644
index 988095496..000000000
--- a/src/app/modules/activities-management/models/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './activity.model';
diff --git a/src/app/modules/activities-management/pages/activities-management.component.spec.ts b/src/app/modules/activities-management/pages/activities-management.component.spec.ts
index 49cd04af9..741949afc 100644
--- a/src/app/modules/activities-management/pages/activities-management.component.spec.ts
+++ b/src/app/modules/activities-management/pages/activities-management.component.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
-import { Activity } from '../models';
+import { Activity } from '../../shared/models';
 import { ActivityService } from './../services/activity.service';
 import { ActivitiesManagementComponent } from './activities-management.component';
 
diff --git a/src/app/modules/activities-management/pages/activities-management.component.ts b/src/app/modules/activities-management/pages/activities-management.component.ts
index 0be21501b..276284a95 100644
--- a/src/app/modules/activities-management/pages/activities-management.component.ts
+++ b/src/app/modules/activities-management/pages/activities-management.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivityService } from '../services/activity.service';
-import { Activity } from '../models';
+import { Activity } from '../../shared/models';
 
 @Component({
   selector: 'app-activities-management',
diff --git a/src/app/modules/activities-management/services/activity.service.spec.ts b/src/app/modules/activities-management/services/activity.service.spec.ts
index f9181e0f4..de5817160 100644
--- a/src/app/modules/activities-management/services/activity.service.spec.ts
+++ b/src/app/modules/activities-management/services/activity.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { Activity } from '../models';
+import { Activity } from '../../shared/models';
 import { ActivityService } from './activity.service';
 
 describe('Activity Service', () => {
diff --git a/src/app/modules/activities-management/services/activity.service.ts b/src/app/modules/activities-management/services/activity.service.ts
index f4fde2162..9d1ce6734 100644
--- a/src/app/modules/activities-management/services/activity.service.ts
+++ b/src/app/modules/activities-management/services/activity.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { Activity } from '../models';
+import { Activity } from '../../shared/models';
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/modules/activities-management/models/activity.model.ts b/src/app/modules/shared/models/activity.model.ts
similarity index 100%
rename from src/app/modules/activities-management/models/activity.model.ts
rename to src/app/modules/shared/models/activity.model.ts
diff --git a/src/app/modules/shared/models/index.ts b/src/app/modules/shared/models/index.ts
index 533725a86..c16dcfc43 100644
--- a/src/app/modules/shared/models/index.ts
+++ b/src/app/modules/shared/models/index.ts
@@ -1,2 +1,3 @@
-export * from './project.model';
+export * from './activity.model';
 export * from './entry.model';
+export * from './project.model';