diff --git a/epf-front-skeleton-main/src/app/app-routing.module.ts b/epf-front-skeleton-main/src/app/app-routing.module.ts
index 5dc7bce3cf3de6f69e6a28b54c15fade25fc93e2..8c70ab9e03e7a2240fe7f755a195626ec105b66b 100644
--- a/epf-front-skeleton-main/src/app/app-routing.module.ts
+++ b/epf-front-skeleton-main/src/app/app-routing.module.ts
@@ -1,14 +1,14 @@
 import { NgModule } from "@angular/core"
 import { RouterModule, Routes } from "@angular/router"
-import { HomeComponent } from "./home/home.component"
-import { StudentsComponent } from "./students/students.component"
-import { StudentsResolver } from "./students/students.resolver"
-import { StudentDetailsComponent } from "./students/student-details/student-details.component"
-import { StudentDetailsResolver } from "./students/student-details/student-details.resolver"
-import { MajorsComponent } from "./majors/majors.component"
-import { MajorsResolver } from "./majors/majors.resolver"
-import { MajorStudentsResolver } from "./majors/major-students/major-students.resolver"
-import { MajorStudentsComponent } from "./majors/major-students/major-students.component"
+import { HomeComponent } from "home/home.component"
+import { StudentsComponent } from "students/students.component"
+import { StudentsResolver } from "students/students.resolver"
+import { StudentDetailsComponent } from "students/student-details/student-details.component"
+import { StudentDetailsResolver } from "students/student-details/student-details.resolver"
+import { MajorsComponent } from "majors/majors.component"
+import { MajorsResolver } from "majors/majors.resolver"
+import { MajorStudentsResolver } from "majors/major-students/major-students.resolver"
+import { MajorStudentsComponent } from "majors/major-students/major-students.component"
 
 const routes: Routes = [
   { path: "", component: HomeComponent },
diff --git a/epf-front-skeleton-main/src/app/app.module.ts b/epf-front-skeleton-main/src/app/app.module.ts
index 56e8771dacf9aa368e93dda00d65058493dafa1c..f1dfdf41059d5bf70f78ad6570ff3ae8dd191a14 100644
--- a/epf-front-skeleton-main/src/app/app.module.ts
+++ b/epf-front-skeleton-main/src/app/app.module.ts
@@ -1,20 +1,20 @@
 import { NgModule } from "@angular/core"
 import { BrowserModule } from "@angular/platform-browser"
 
-import { AppRoutingModule } from "./app-routing.module"
-import { AppComponent } from "./app.component"
+import { AppRoutingModule } from "app-routing.module"
+import { AppComponent } from "app.component"
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations"
-import { NavbarComponent } from "./navbar/navbar.component"
+import { NavbarComponent } from "navbar/navbar.component"
 import { MatListModule } from "@angular/material/list"
-import { HomeComponent } from "./home/home.component"
-import { StudentsComponent } from "./students/students.component"
-import { StudentDetailsComponent } from "./students/student-details/student-details.component"
+import { HomeComponent } from "home/home.component"
+import { StudentsComponent } from "students/students.component"
+import { StudentDetailsComponent } from "students/student-details/student-details.component"
 import { FormsModule } from "@angular/forms"
 import { MatIconModule } from "@angular/material/icon"
 import { MatButtonModule } from "@angular/material/button"
-import { MajorsComponent } from "./majors/majors.component"
-import { MajorStudentsComponent } from "./majors/major-students/major-students.component"
-import { ResearchComponent } from "./students/research/research.component"
+import { MajorsComponent } from "majors/majors.component"
+import { MajorStudentsComponent } from "majors/major-students/major-students.component"
+import { ResearchComponent } from "students/research/research.component"
 
 @NgModule({
   declarations: [
diff --git a/epf-front-skeleton-main/src/app/majors/majors.component.ts b/epf-front-skeleton-main/src/app/majors/majors.component.ts
index e600f847a85aa28c622fe3bba41062eef49201c8..7fc3b527a0a2b0f751ba92892fb947edaaa65117 100644
--- a/epf-front-skeleton-main/src/app/majors/majors.component.ts
+++ b/epf-front-skeleton-main/src/app/majors/majors.component.ts
@@ -1,6 +1,6 @@
 import { Component } from "@angular/core"
 import { map, Observable } from "rxjs"
-import { Major } from "../models/major.model"
+import { Major } from "models/major.model"
 import { ActivatedRoute } from "@angular/router"
 
 @Component({
diff --git a/epf-front-skeleton-main/src/app/majors/majors.resolver.ts b/epf-front-skeleton-main/src/app/majors/majors.resolver.ts
index dee4bef79f8ad1c2905d5dfdcf66c2c81c24dc15..64c2209012def8e367bd370625c2cff5634356a9 100644
--- a/epf-front-skeleton-main/src/app/majors/majors.resolver.ts
+++ b/epf-front-skeleton-main/src/app/majors/majors.resolver.ts
@@ -1,8 +1,8 @@
 import { Injectable } from "@angular/core"
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router"
 import { Observable } from "rxjs"
-import { MajorService } from "../services/major.service"
-import { Major } from "../models/major.model"
+import { MajorService } from "services/major.service"
+import { Major } from "models/major.model"
 
 @Injectable({
   providedIn: "root",
diff --git a/epf-front-skeleton-main/src/app/navbar/navbar.component.ts b/epf-front-skeleton-main/src/app/navbar/navbar.component.ts
index 5c06bc1eef769b61b9bbb21c41ff69b4d0c26722..6e039d549fadd4470ff083afabf00fa2ee668de7 100644
--- a/epf-front-skeleton-main/src/app/navbar/navbar.component.ts
+++ b/epf-front-skeleton-main/src/app/navbar/navbar.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from "@angular/core"
-import { Link } from "../models/links.model"
+import { Link } from "models/links.model"
 
 @Component({
   selector: "epf-navbar",
diff --git a/epf-front-skeleton-main/src/app/services/constantsMock.service.ts b/epf-front-skeleton-main/src/app/services/constantsMock.service.ts
index 2341e6221ecee7c41e7240a46b8f82f68bb7572b..9819e7610df27ddafcb3881414b8c278e080822f 100644
--- a/epf-front-skeleton-main/src/app/services/constantsMock.service.ts
+++ b/epf-front-skeleton-main/src/app/services/constantsMock.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core"
-import { Student } from "../models/student.model"
-import { Course } from "../models/course.model"
-import { Major } from "../models/major.model"
+import { Student } from "models/student.model"
+import { Course } from "models/course.model"
+import { Major } from "models/major.model"
 
 @Injectable({
   providedIn: "root",
diff --git a/epf-front-skeleton-main/src/app/services/course.service.ts b/epf-front-skeleton-main/src/app/services/course.service.ts
index 23d6508d79651470451f8af84af8ce116375f78e..c79212d65b7f0f60dada444dd96c7aaca687372c 100644
--- a/epf-front-skeleton-main/src/app/services/course.service.ts
+++ b/epf-front-skeleton-main/src/app/services/course.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core"
 import { Observable } from "rxjs"
-import { Course } from "../models/course.model"
+import { Course } from "models/course.model"
 import { ConstantsMockService } from "./constantsMock.service"
 
 @Injectable({
diff --git a/epf-front-skeleton-main/src/app/services/major.service.ts b/epf-front-skeleton-main/src/app/services/major.service.ts
index 65f1422e621524ebf5bf1bca8896b126cbe4428c..eac8a4a6a6f0923ef4bc5a679bf904a6433e3975 100644
--- a/epf-front-skeleton-main/src/app/services/major.service.ts
+++ b/epf-front-skeleton-main/src/app/services/major.service.ts
@@ -1,8 +1,8 @@
 import { Injectable } from "@angular/core"
 import { Observable } from "rxjs"
-import { Major } from "../models/major.model"
-import { MajorStudentsDto } from "../models/dto/MajorStudentsDto"
-import { MajorsAndCoursesDto } from "../models/dto/majorsAndCoursesDto"
+import { Major } from "models/major.model"
+import { MajorStudentsDto } from "models/dto/MajorStudentsDto"
+import { MajorsAndCoursesDto } from "models/dto/majorsAndCoursesDto"
 import { ConstantsMockService } from "./constantsMock.service"
 
 @Injectable({
diff --git a/epf-front-skeleton-main/src/app/services/student.service.ts b/epf-front-skeleton-main/src/app/services/student.service.ts
index e2ddfa4f868937f3909d267b273f98440e6ffb91..12e9462d10ac43381ea014694e003efa0e738346 100644
--- a/epf-front-skeleton-main/src/app/services/student.service.ts
+++ b/epf-front-skeleton-main/src/app/services/student.service.ts
@@ -1,9 +1,9 @@
 import { Injectable } from "@angular/core"
 import { Observable } from "rxjs"
-import { Student } from "../models/student.model"
-import { Course } from "../models/course.model"
+import { Student } from "models/student.model"
+import { Course } from "models/course.model"
 import { ConstantsMockService } from "./constantsMock.service"
-import { MajorsAndCoursesDto } from "../models/dto/majorsAndCoursesDto"
+import { MajorsAndCoursesDto } from "models/dto/majorsAndCoursesDto"
 
 @Injectable({
   providedIn: "root",
diff --git a/epf-front-skeleton-main/src/app/students/research/research.component.ts b/epf-front-skeleton-main/src/app/students/research/research.component.ts
index 8302163caf290766b49a71d6d6728b0cb88a072e..ec56e51fb85986d7132e3ad2aa3684de0332300f 100644
--- a/epf-front-skeleton-main/src/app/students/research/research.component.ts
+++ b/epf-front-skeleton-main/src/app/students/research/research.component.ts
@@ -1,11 +1,11 @@
 import { Component, EventEmitter, OnInit, Output } from "@angular/core"
 import { Observable } from "rxjs"
-import { MajorsAndCoursesDto } from "../../models/dto/majorsAndCoursesDto"
-import { Major } from "../../models/major.model"
-import { MajorService } from "../../services/major.service"
-import { Course } from "../../models/course.model"
-import { StudentService } from "../../services/student.service"
-import { Student } from "../../models/student.model"
+import { MajorsAndCoursesDto } from "models/dto/majorsAndCoursesDto"
+import { Major } from "models/major.model"
+import { MajorService } from "services/major.service"
+import { Course } from "models/course.model"
+import { StudentService } from "services/student.service"
+import { Student } from "models/student.model"
 
 @Component({
   selector: "epf-research",
diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html
index 1be714238288799ef82ce343cc0090815e9388a7..cdd03ba0c1213910b4a1698f19c30a20f5c57363 100644
--- a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html
+++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html
@@ -2,7 +2,7 @@
   <h1>Student's personal data</h1>
   <form (ngSubmit)="save(student)" #studentForm="ngForm">
     <div class="form-group">
-      <label for="firstName">Fist Name</label>
+      <label for="firstName">First Name</label>
       <input type="text" class="form-control" id="firstName"
              required
              [(ngModel)]="student.firstName" name="firstName"
diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts
index d4637b382c1f4e95a3a2dacd4fb8a696b36d5559..e090df44a181bc2e5aee1ad4ccab02d5cab025b5 100644
--- a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts
+++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts
@@ -1,10 +1,10 @@
 import { Component } from "@angular/core"
 import { map, Observable } from "rxjs"
-import { Student } from "../../models/student.model"
+import { Student } from "models/student.model"
 import { ActivatedRoute, Router } from "@angular/router"
-import { Course } from "../../models/course.model"
-import { CourseService } from "../../services/course.service"
-import { StudentService } from "../../services/student.service"
+import { Course } from "models/course.model"
+import { CourseService } from "services/course.service"
+import { StudentService } from "services/student.service"
 
 @Component({
   selector: "epf-student-details",
diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts b/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts
index 0388f40814b944e206086cf677895f4f0db0a2e6..7d971f9157c8515c5be7d625fb3b56f75cd29cbd 100644
--- a/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts
+++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts
@@ -1,9 +1,9 @@
 import { Injectable } from "@angular/core"
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router"
 import { Observable } from "rxjs"
-import { StudentService } from "../../services/student.service"
-import { Student } from "../../models/student.model"
-import { Major } from "../../models/major.model"
+import { StudentService } from "services/student.service"
+import { Student } from "models/student.model"
+import { Major } from "models/major.model"
 
 @Injectable({
   providedIn: "root",
diff --git a/epf-front-skeleton-main/src/app/students/students.component.ts b/epf-front-skeleton-main/src/app/students/students.component.ts
index 5e5fd687e2bec56773d23a4959cabab2aa5f41f1..d83297a5f45be02af855d27cb957be3c3e55ff8a 100644
--- a/epf-front-skeleton-main/src/app/students/students.component.ts
+++ b/epf-front-skeleton-main/src/app/students/students.component.ts
@@ -1,8 +1,8 @@
 import { Component } from "@angular/core"
 import { map, Observable } from "rxjs"
-import { Student } from "../models/student.model"
+import { Student } from "models/student.model"
 import { ActivatedRoute } from "@angular/router"
-import { StudentService } from "../services/student.service"
+import { StudentService } from "services/student.service"
 
 @Component({
   selector: "epf-students",
diff --git a/epf-front-skeleton-main/src/app/students/students.resolver.ts b/epf-front-skeleton-main/src/app/students/students.resolver.ts
index ce3c123744731c186b35c5f9d86043f92c6ce684..a4a65422c287ce97dc1a26f096b1a89803492ee0 100644
--- a/epf-front-skeleton-main/src/app/students/students.resolver.ts
+++ b/epf-front-skeleton-main/src/app/students/students.resolver.ts
@@ -1,8 +1,8 @@
 import { Injectable } from "@angular/core"
 import { Resolve } from "@angular/router"
 import { Observable } from "rxjs"
-import { Student } from "../models/student.model"
-import { StudentService } from "../services/student.service"
+import { Student } from "models/student.model"
+import { StudentService } from "services/student.service"
 
 @Injectable({
   providedIn: "root",
diff --git a/epf-front-skeleton-main/tsconfig.json b/epf-front-skeleton-main/tsconfig.json
index ff06eae10c542e0ecce4498ce0caef544483f0af..0769790d483e5d0e5f55b4700eb6804b176c01a9 100644
--- a/epf-front-skeleton-main/tsconfig.json
+++ b/epf-front-skeleton-main/tsconfig.json
@@ -2,7 +2,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
-    "baseUrl": "./",
+    "baseUrl": "src/app",
     "outDir": "./dist/out-tsc",
     "forceConsistentCasingInFileNames": true,
     "strict": true,