(F) Change folder architecture

Clinics.Frontend/src/app/app-routing.module.ts

 import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
 import { HomeComponent } from './components/shared/home/home.component';
-import { RoleGuard } from './services/authentication/guards/role-guard';
-import { Roles } from './classes/authentication/roles';
 import { ForbiddenComponent } from './components/shared/errors/forbidden/forbidden.component';
 import { NotFoundComponent } from './components/shared/errors/not-found/not-found.component';
-import { TestSignalRComponent } from './components/notifications/test-signal-r/test-signal-r.component';
-import { DoctorUsersComponent } from './components/admin/doctor-users/doctor-users.component';
-import { AdminDashboardComponent } from './components/admin/admin-dashboard/admin-dashboard.component';
-import { CreateDoctorUserFormComponent } from './components/admin/create-doctor-user-form/create-doctor-user-form.component';
-import { UpdateDoctorUserComponent } from './components/admin/update-doctor-user/update-doctor-user.component';
-import { ReceptionistUserComponent } from './components/admin/receptionist-user/receptionist-user.component';
-import { ReceptionistUsersComponent } from './components/admin/receptionist-users/receptionist-users.component';
-import { ReceptionistDashboardComponent } from './components/receptionist/receptionist-dashboard/receptionist-dashboard.component';
-import { WaitingListComponent } from './components/receptionist/waiting-list/waiting-list.component';
-import { DoctorsComponent } from './components/receptionist/doctors/doctors.component';
-import { CreateWitingListItemAccordionComponent } from './components/receptionist/create-witing-list-item-accordion/create-witing-list-item-accordion.component';
-import { CreateEmployeeFormComponent } from './components/receptionist/create-employee-form/create-employee-form.component';
-import { EmployeeComponent } from './components/receptionist/employee/employee.component';
-import { DoctorDashboardComponent } from './components/doctor/doctor-dashboard/doctor-dashboard.component';
-import { HistoryComponent } from './components/doctor/history/history.component';
-import { CreateVisitComponent } from './components/doctor/create-visit/create-visit.component';
-import { DoctorPhonesComponent } from './components/doctor/doctor-phones/doctor-phones.component';
-import { CreateDoctorPhoneComponent } from './components/doctor/create-doctor-phone/create-doctor-phone.component';
+import { DoctorUsersComponent } from './components/usecases/admin-usecases/list-doctor-users/doctor-users/doctor-users.component';
+import { CreateDoctorUserFormComponent } from './components/usecases/admin-usecases/create-doctor-user/create-doctor-user-form/create-doctor-user-form.component';
+import { AdminDashboardComponent } from './components/usecases/admin-usecases/shared/admin-dashboard/admin-dashboard.component';
+import { UpdateDoctorUserComponent } from './components/usecases/admin-usecases/update-doctor-user/shared/update-doctor-user/update-doctor-user.component';
+import { ReceptionistUsersComponent } from './components/usecases/admin-usecases/list-receptionist-users/receptionist-users/receptionist-users.component';
+import { ReceptionistDashboardComponent } from './components/usecases/receptionist-usecases/shared/receptionist-dashboard/receptionist-dashboard.component';
+import { WaitingListComponent } from './components/usecases/receptionist-usecases/list-waiting-list-items/waiting-list/waiting-list.component';
+import { DoctorsComponent } from './components/usecases/receptionist-usecases/list-doctors/doctors/doctors.component';
+import { CreateWitingListItemAccordionComponent } from './components/usecases/receptionist-usecases/create-waiting-list-item/create-witing-list-item-accordion/create-witing-list-item-accordion.component';
+import { CreateEmployeeFormComponent } from './components/usecases/receptionist-usecases/create-employee/create-employee-form/create-employee-form.component';
+import { EmployeeComponent } from './components/usecases/receptionist-usecases/show-employee/employee/employee.component';
+import { DoctorDashboardComponent } from './components/usecases/doctor-usecases/shared/doctor-dashboard/doctor-dashboard.component';
+import { HistoryComponent } from './components/usecases/doctor-usecases/list-visits-history/history/history.component';
+import { CreateVisitComponent } from './components/usecases/doctor-usecases/create-visit/create-visit/create-visit.component';
+import { DoctorPhonesComponent } from './components/usecases/doctor-usecases/list-doctor-phones/doctor-phones/doctor-phones.component';
+import { CreateDoctorPhoneComponent } from './components/usecases/doctor-usecases/create-doctor-phone/create-doctor-phone/create-doctor-phone.component';
+import { RouterModule, Routes } from '@angular/router';
+import { RoleGuard } from './services/authentication/guards/role-guard';
+import { Roles } from './classes/authentication/roles-constants/roles';
+
 
 const routes: Routes = [
   {
@@ -148,16 +147,6 @@ const routes: Routes = [
       }
     ]
   },
-  
-  // #region Testing SignalR
-  {
-    path: 'testing',
-    component: TestSignalRComponent,
-    canActivate: [RoleGuard],
-    data: { role: Roles.NotRegistered }
-  },
-  // #endregion
-  
   // Everything else
   {
     path: '**',

Clinics.Frontend/src/app/app.module.ts

@@ -9,58 +9,55 @@ import { LayoutComponent } from './components/shared/template/layout/layout.comp
 import { HeaderComponent } from './components/shared/template/header/header.component';
 import { FooterComponent } from './components/shared/template/footer/footer.component';
 import { HomeComponent } from './components/shared/home/home.component';
-import { LoginFormComponent } from './components/authentication/login-form/login-form.component';
+import { LoginFormComponent } from './components/usecases/shared-usecases/login/login-form/login-form.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-
 import { AuthenticationService } from './services/authentication/authentication.service';
 import { AuthenticationInterceptor } from './services/authentication/interceptor/authentication.interceptor';
 import { ForbiddenComponent } from './components/shared/errors/forbidden/forbidden.component';
 import { NotFoundComponent } from './components/shared/errors/not-found/not-found.component';
-import { TestSignalRComponent } from './components/notifications/test-signal-r/test-signal-r.component';
-import { SignalRService } from './services/notifications/signal-r.service';
-import { DoctorUsersComponent } from './components/admin/doctor-users/doctor-users.component';
-import { DoctorUserComponent } from './components/admin/doctor-user/doctor-user.component';
-import { DoctorUsersService } from './services/admin/doctor-users.service';
-import { CreateDoctorUserFormComponent } from './components/admin/create-doctor-user-form/create-doctor-user-form.component';
-import { AdminDashboardComponent } from './components/admin/admin-dashboard/admin-dashboard.component';
-import { UpdateDoctorUserComponent } from './components/admin/update-doctor-user/update-doctor-user.component';
-import { UpdateDoctorPersonalDataFormComponent } from './components/admin/update-doctor-personal-data-form/update-doctor-personal-data-form.component';
-import { UpdateDoctorUserDataFormComponent } from './components/admin/update-doctor-user-data-form/update-doctor-user-data-form.component';
-import { ReceptionistUserComponent } from './components/admin/receptionist-user/receptionist-user.component';
-import { ReceptionistUsersComponent } from './components/admin/receptionist-users/receptionist-users.component';
-import { ReceptionistUsersService } from './services/admin/receptionist-users.service';
-import { ReceptionistDashboardComponent } from './components/receptionist/receptionist-dashboard/receptionist-dashboard.component';
-import { WaitingListComponent } from './components/receptionist/waiting-list/waiting-list.component';
-import { WaitingListItemComponent } from './components/receptionist/waiting-list-item/waiting-list-item.component';
-import { DoctorsComponent } from './components/receptionist/doctors/doctors.component';
-import { DoctorItemComponent } from './components/receptionist/doctor-item/doctor-item.component';
-import { CreateWitingListItemAccordionComponent } from './components/receptionist/create-witing-list-item-accordion/create-witing-list-item-accordion.component';
-import { CreateWitingListItemForEmployeeComponent } from './components/receptionist/create-witing-list-item-for-employee/create-witing-list-item-for-employee.component';
-import { CreateWitingListItemForFamilyMemberComponent } from './components/receptionist/create-witing-list-item-for-family-member/create-witing-list-item-for-family-member.component';
-import { CreateEmployeeFormComponent } from './components/receptionist/create-employee-form/create-employee-form.component';
-import { EmployeeSerialNumberPopUpComponent } from './components/receptionist/employee-serial-number-pop-up/employee-serial-number-pop-up.component';
-import { EmployeeComponent } from './components/receptionist/employee/employee.component';
+import { DoctorUsersComponent } from './components/usecases/admin-usecases/list-doctor-users/doctor-users/doctor-users.component';
+import { DoctorUserComponent } from './components/usecases/admin-usecases/list-doctor-users/doctor-user/doctor-user.component';
+import { DoctorUsersService } from './services/doctor-users/doctor-users.service';
+import { CreateDoctorUserFormComponent } from './components/usecases/admin-usecases/create-doctor-user/create-doctor-user-form/create-doctor-user-form.component';
+import { AdminDashboardComponent } from './components/usecases/admin-usecases/shared/admin-dashboard/admin-dashboard.component';
+import { UpdateDoctorUserComponent } from './components/usecases/admin-usecases/update-doctor-user/shared/update-doctor-user/update-doctor-user.component';
+import { UpdateDoctorPersonalDataFormComponent } from './components/usecases/admin-usecases/update-doctor-user/update-doctor-user-personal-data/update-doctor-personal-data-form/update-doctor-personal-data-form.component';
+import { UpdateDoctorUserDataFormComponent } from './components/usecases/admin-usecases/update-doctor-user/update-doctor-user-account-data/update-doctor-user-data-form/update-doctor-user-data-form.component';
+import { ReceptionistUserComponent } from './components/usecases/admin-usecases/list-receptionist-users/receptionist-user/receptionist-user.component';
+import { ReceptionistUsersComponent } from './components/usecases/admin-usecases/list-receptionist-users/receptionist-users/receptionist-users.component';
+import { ReceptionistUsersService } from './services/receptionist-users/receptionist-users.service';
+import { ReceptionistDashboardComponent } from './components/usecases/receptionist-usecases/shared/receptionist-dashboard/receptionist-dashboard.component';
+import { WaitingListComponent } from './components/usecases/receptionist-usecases/list-waiting-list-items/waiting-list/waiting-list.component';
+import { WaitingListItemComponent } from './components/usecases/receptionist-usecases/list-waiting-list-items/waiting-list-item/waiting-list-item.component';
+import { DoctorsComponent } from './components/usecases/receptionist-usecases/list-doctors/doctors/doctors.component';
+import { DoctorItemComponent } from './components/usecases/receptionist-usecases/list-doctors/doctor-item/doctor-item.component';
+import { CreateWitingListItemAccordionComponent } from './components/usecases/receptionist-usecases/create-waiting-list-item/create-witing-list-item-accordion/create-witing-list-item-accordion.component';
+import { CreateWitingListItemForEmployeeComponent } from './components/usecases/receptionist-usecases/create-waiting-list-item/create-witing-list-item-for-employee/create-witing-list-item-for-employee.component';
+import { CreateWitingListItemForFamilyMemberComponent } from './components/usecases/receptionist-usecases/create-waiting-list-item/create-witing-list-item-for-family-member/create-witing-list-item-for-family-member.component';
+import { CreateEmployeeFormComponent } from './components/usecases/receptionist-usecases/create-employee/create-employee-form/create-employee-form.component';
+import { EmployeeSerialNumberPopUpComponent } from './components/usecases/receptionist-usecases/shared/employee-serial-number-pop-up/employee-serial-number-pop-up.component';
+import { EmployeeComponent } from './components/usecases/receptionist-usecases/show-employee/employee/employee.component';
 import { WaitingListService } from './services/waitingList/waiting-list.service';
 import { EmployeesDataService } from './services/employees/employees-data.service';
 import { ScrollToTopDirective } from './directives/scroll-to-top.directive';
-import { DoctorDashboardComponent } from './components/doctor/doctor-dashboard/doctor-dashboard.component';
-import { DoctorNotificationsService } from './services/doctorsNotifications/doctor-notifications.service';
-import { DoctorStatusComponent } from './components/doctor/doctor-status/doctor-status.component';
-import { AskForSerialNumberComponent } from './components/doctor/ask-for-serial-number/ask-for-serial-number.component';
-import { HistoryComponent } from './components/doctor/history/history.component';
-import { VisitComponent } from './components/doctor/visit/visit.component';
-import { CreateVisitComponent } from './components/doctor/create-visit/create-visit.component';
-import { MedicinesComponent } from './components/doctor/medicines/medicines.component';
+import { DoctorDashboardComponent } from './components/usecases/doctor-usecases/shared/doctor-dashboard/doctor-dashboard.component';
+import { DoctorNotificationsService } from './services/notifications/doctor-notifications/doctor-notifications.service';
+import { DoctorStatusComponent } from './components/usecases/doctor-usecases/show-status/doctor-status/doctor-status.component';
+import { AskForSerialNumberComponent } from './components/usecases/doctor-usecases/shared/ask-for-serial-number/ask-for-serial-number.component';
+import { HistoryComponent } from './components/usecases/doctor-usecases/list-visits-history/history/history.component';
+import { VisitComponent } from './components/usecases/doctor-usecases/create-visit/visit/visit.component';
+import { CreateVisitComponent } from './components/usecases/doctor-usecases/create-visit/create-visit/create-visit.component';
+import { MedicinesComponent } from './components/usecases/doctor-usecases/list-visits-history/medicines/medicines.component';
 import { AccordionDirective } from './directives/accordion.directive';
-import { PatientIsComingNotificationComponent } from './components/doctor/patient-is-coming-notification/patient-is-coming-notification.component';
+import { PatientIsComingNotificationComponent } from './components/notifications/doctor-notifications/patient-is-coming-notification/patient-is-coming-notification.component';
 import { VisitsService } from './services/visits/visits.service';
 import { ArabicDatePipe } from './pipes/arabic-date.pipe';
 import { MedicinesService } from './services/medicines/medicines.service';
-import { SearchForMedicineComponent } from './components/doctor/search-for-medicine/search-for-medicine.component';
-import { DoctorPhoneComponent } from './components/doctor/doctor-phone/doctor-phone.component';
-import { DoctorPhonesComponent } from './components/doctor/doctor-phones/doctor-phones.component';
-import { CreateDoctorPhoneComponent } from './components/doctor/create-doctor-phone/create-doctor-phone.component';
+import { SearchForMedicineComponent } from './components/usecases/doctor-usecases/create-visit/search-for-medicine/search-for-medicine.component';
+import { DoctorPhoneComponent } from './components/usecases/doctor-usecases/list-doctor-phones/doctor-phone/doctor-phone.component';
+import { DoctorPhonesComponent } from './components/usecases/doctor-usecases/list-doctor-phones/doctor-phones/doctor-phones.component';
+import { CreateDoctorPhoneComponent } from './components/usecases/doctor-usecases/create-doctor-phone/create-doctor-phone/create-doctor-phone.component';
 
 
 @NgModule({
@@ -84,7 +81,6 @@ import { CreateDoctorPhoneComponent } from './components/doctor/create-doctor-ph
   providers: [
     AuthenticationService,
     { provide: HTTP_INTERCEPTORS, useClass: AuthenticationInterceptor, multi: true},
-    SignalRService,
     DoctorUsersService,
     ReceptionistUsersService,
     WaitingListService,
@@ -106,7 +102,6 @@ import { CreateDoctorPhoneComponent } from './components/doctor/create-doctor-ph
     LoginFormComponent,
     ForbiddenComponent,
     NotFoundComponent,
-    TestSignalRComponent,
     DoctorUserComponent,
     DoctorUsersComponent,
     CreateDoctorUserFormComponent,

Clinics.Frontend/src/app/classes/medicine/visit-medicine.ts → Clinics.Frontend/src/app/classes/visit/visit-medicine/visit-medicine.ts

-import { MedicineSearchResult } from "./medicine-search-result";
+import { MedicineSearchResult } from "../../usecases/doctor-usecases/search-for-medicine/medicine-search-result";
 
 export class VisitMedicine {
     public id: number;

Clinics.Frontend/src/app/classes/visit/visit-view.ts

-import { MedicineView } from "../medicine/medicine-view";
+import { MedicineView } from "../usecases/doctor-usecases/search-for-medicine/medicine-view";
 
 export class VisitView {
     doctorName: string;

Clinics.Frontend/src/app/components/notifications/test-signal-r/test-signal-r.component.html

-<div>
-    <div class="text-center">
-        <h2>Notifications:</h2>
-        <h3>{{notification}}</h3>
-        <button (click)="onClick()" class="btn btn-outline-danger">Stop</button>
-
-    </div>
-</div>
\ No newline at end of file

Clinics.Frontend/src/app/components/notifications/test-signal-r/test-signal-r.component.ts

-import { Component, OnInit } from '@angular/core';
-import { SignalRService } from '../../../services/notifications/signal-r.service';
-
-@Component({
-  selector: 'app-test-signal-r',
-  templateUrl: './test-signal-r.component.html',
-  styleUrls: ['./test-signal-r.component.css']
-})
-export class TestSignalRComponent implements OnInit {
-
-  notification: string = '';
-
-  constructor(private signalR: SignalRService){}
-
-  ngOnInit(): void {
-    this.signalR.startConnection();
-    this.signalR.hubConnection.on('ReceiveNotification', (message) => {
-      this.notification = message;
-    })
-  }
-
-  onClick(): void {
-    this.signalR.endConnection();
-  }
-
-}
\ No newline at end of file

Clinics.Frontend/src/app/components/shared/template/header/header.component.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { UserData } from '../../../../classes/authentication/user-data';
 import { AuthenticationService } from '../../../../services/authentication/authentication.service';
 import { Router } from '@angular/router';
-import { Roles } from '../../../../classes/authentication/roles';
+import { Roles } from '../../../../classes/authentication/roles-constants/roles';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ToastrService } from 'ngx-toastr';
 import { ViewportScroller } from '@angular/common';

Clinics.Frontend/src/app/components/shared/template/layout/layout.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { UserData } from '../../../../classes/authentication/user-data';
 import { AuthenticationService } from '../../../../services/authentication/authentication.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { DoctorNotificationsService } from '../../../../services/doctorsNotifications/doctor-notifications.service';
+import { DoctorNotificationsService } from '../../../../services/notifications/doctor-notifications/doctor-notifications.service';
 
 @Component({
   selector: 'app-layout',

Clinics.Frontend/src/app/components/admin/create-doctor-user-form/create-doctor-user-form.component.ts → Clinics.Frontend/src/app/components/usecases/admin-usecases/create-doctor-user/create-doctor-user-form/create-doctor-user-form.component.ts

 import { Component, ViewChild } from '@angular/core';
-import { DoctorUsersService } from '../../../services/admin/doctor-users.service';
+import { DoctorUsersService } from '../../../../../services/doctor-users/doctor-users.service';
 import { ToastrService } from 'ngx-toastr';
-import { CreateDoctorUserCommand } from '../../../classes/admin/create-doctor-user-command';
+import { CreateDoctorUserCommand } from '../../../../../classes/usecases/admin-usecases/create-doctor-user/create-doctor-user-command';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ViewportScroller } from '@angular/common';
-import { ConstantMessages } from '../../../constants/messages';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-create-doctor-user-form',

Clinics.Frontend/src/app/components/admin/doctor-user/doctor-user.component.ts → Clinics.Frontend/src/app/components/usecases/admin-usecases/list-doctor-users/doctor-user/doctor-user.component.ts

 import { Component, Input } from '@angular/core';
-import { DoctorUser } from '../../../classes/admin/doctor-user';
+import { DoctorUser } from '../../../../../classes/usecases/admin-usecases/list-doctor-users/doctor-user';
 
 @Component({
   selector: 'app-doctor-user',

Clinics.Frontend/src/app/components/admin/doctor-users/doctor-users.component.ts → Clinics.Frontend/src/app/components/usecases/admin-usecases/list-doctor-users/doctor-users/doctor-users.component.ts

 import { Component, OnInit } from '@angular/core';
-import { DoctorUsersService } from '../../../services/admin/doctor-users.service';
-import { DoctorUser } from '../../../classes/admin/doctor-user';
-import { GetAllDoctorUsersResult } from '../../../classes/admin/get-all-doctor-users-result';
+import { DoctorUsersService } from '../../../../../services/doctor-users/doctor-users.service';
+import { DoctorUser } from '../../../../../classes/usecases/admin-usecases/list-doctor-users/doctor-user';
+import { GetAllDoctorUsersResult } from '../../../../../classes/usecases/admin-usecases/list-doctor-users/get-all-doctor-users-result';
 
 @Component({
   selector: 'app-doctor-users',

Clinics.Frontend/src/app/components/admin/receptionist-user/receptionist-user.component.ts → Clinics.Frontend/src/app/components/usecases/admin-usecases/list-receptionist-users/receptionist-user/receptionist-user.component.ts

 import { Component, Input, OnInit } from '@angular/core';
-import { ReceptionistUser } from '../../../classes/admin/receptionist-user';
+import { ReceptionistUser } from '../../../../../classes/usecases/admin-usecases/list-receptionist-users/receptionist-user';
 
 @Component({
   selector: 'app-receptionist-user',

Clinics.Frontend/src/app/components/admin/receptionist-users/receptionist-users.component.ts → Clinics.Frontend/src/app/components/usecases/admin-usecases/list-receptionist-users/receptionist-users/receptionist-users.component.ts

 import { Component, OnInit } from '@angular/core';
-import { ReceptionistUser } from '../../../classes/admin/receptionist-user';
-import { ReceptionistUsersService } from '../../../services/admin/receptionist-users.service';
+import { ReceptionistUser } from '../../../../../classes/usecases/admin-usecases/list-receptionist-users/receptionist-user';
+import { ReceptionistUsersService } from '../../../../../services/receptionist-users/receptionist-users.service';
 
 @Component({
   selector: 'app-receptionist-users',

Clinics.Frontend/src/app/components/admin/update-doctor-user/update-doctor-user.component.ts → Clinics.Frontend/src/app/components/usecases/admin-usecases/update-doctor-user/shared/update-doctor-user/update-doctor-user.component.ts

 import { Component, OnInit } from '@angular/core';
-import { DoctorUsersService } from '../../../services/admin/doctor-users.service';
-import { DoctorUserResponse } from '../../../classes/admin/doctor-user-response';
+import { DoctorUsersService } from '../../../../../../services/doctor-users/doctor-users.service';
+import { DoctorUserResponse } from '../../../../../../classes/usecases/admin-usecases/list-doctor-users/doctor-user-response';
 import { ActivatedRoute } from '@angular/router';
-import { UpdateDoctorPersonalDataQuery } from '../../../classes/admin/update-doctor-personal-data-query';
-import { UpdateDoctorUserQuery } from '../../../classes/admin/update-doctor-user-query';
+import { UpdateDoctorPersonalDataQuery } from '../../../../../../classes/usecases/admin-usecases/update-doctor-user/update-doctor-user-personal-data/update-doctor-personal-data-query';
+import { UpdateDoctorUserQuery } from '../../../../../../classes/usecases/admin-usecases/update-doctor-user/update-doctor-user-account-data/update-doctor-user-query';
 
 @Component({
   selector: 'app-update-doctor-user',

Clinics.Frontend/src/app/components/admin/update-doctor-user-data-form/update-doctor-user-data-form.component.ts → Clinics.Frontend/src/app/components/usecases/admin-usecases/update-doctor-user/update-doctor-user-account-data/update-doctor-user-data-form/update-doctor-user-data-form.component.ts

 import { Component, Input, ViewChild } from '@angular/core';
-import { UpdateDoctorUserQuery } from '../../../classes/admin/update-doctor-user-query';
-import { DoctorUsersService } from '../../../services/admin/doctor-users.service';
+import { UpdateDoctorUserQuery } from '../../../../../../classes/usecases/admin-usecases/update-doctor-user/update-doctor-user-account-data/update-doctor-user-query';
+import { DoctorUsersService } from '../../../../../../services/doctor-users/doctor-users.service';
 import { ToastrService } from 'ngx-toastr';
 import { Router } from '@angular/router';
 import { NgForm } from '@angular/forms';
-import { ConstantMessages } from '../../../constants/messages';
+import { ConstantMessages } from '../../../../../../constants/messages';
 
 @Component({
   selector: 'app-update-doctor-user-data-form',

Clinics.Frontend/src/app/components/admin/update-doctor-personal-data-form/update-doctor-personal-data-form.component.ts → Clinics.Frontend/src/app/components/usecases/admin-usecases/update-doctor-user/update-doctor-user-personal-data/update-doctor-personal-data-form/update-doctor-personal-data-form.component.ts

 import { Component, Input, ViewChild } from '@angular/core';
-import { DoctorUsersService } from '../../../services/admin/doctor-users.service';
+import { DoctorUsersService } from '../../../../../../services/doctor-users/doctor-users.service';
 import { ToastrService } from 'ngx-toastr';
 import { NgForm } from '@angular/forms';
-import { UpdateDoctorPersonalDataQuery } from '../../../classes/admin/update-doctor-personal-data-query';
+import { UpdateDoctorPersonalDataQuery } from '../../../../../../classes/usecases/admin-usecases/update-doctor-user/update-doctor-user-personal-data/update-doctor-personal-data-query';
 import { Router } from '@angular/router';
-import { ConstantMessages } from '../../../constants/messages';
+import { ConstantMessages } from '../../../../../../constants/messages';
 
 @Component({
   selector: 'app-update-doctor-personal-data-form',

Clinics.Frontend/src/app/components/doctor/create-doctor-phone/create-doctor-phone.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/create-doctor-phone/create-doctor-phone/create-doctor-phone.component.ts

 import { Component, OnInit, ViewChild } from '@angular/core';
 import { NgForm } from '@angular/forms';
-import { DoctorPhone } from '../../../classes/doctor/phones/doctor-phone';
-import { DoctorsService } from '../../../services/doctors/doctors.service';
-import { AuthenticationService } from '../../../services/authentication/authentication.service';
+import { DoctorPhone } from '../../../../../classes/doctor/doctor-phones/doctor-phone';
+import { DoctorsService } from '../../../../../services/doctors/doctors.service';
+import { AuthenticationService } from '../../../../../services/authentication/authentication.service';
 import { ToastrService } from 'ngx-toastr';
 import { ViewportScroller } from '@angular/common';
-import { ConstantMessages } from '../../../constants/messages';
+import { ConstantMessages } from '../../../../../constants/messages';
 import { Router } from '@angular/router';
 
 @Component({

Clinics.Frontend/src/app/components/doctor/create-visit/create-visit.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/create-visit/create-visit/create-visit.component.ts

 import { Component, OnInit } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { EmployeesDataService } from '../../../services/employees/employees-data.service';
+import { EmployeesDataService } from '../../../../../services/employees/employees-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
-import { EmployeeData } from '../../../classes/employeeData/employee-data';
+import { EmployeeData } from '../../../../../classes/employee/employee-data';
 import { ToastrService } from 'ngx-toastr';
-import { MedicineView } from '../../../classes/medicine/medicine-view';
-import { VisitMedicine } from '../../../classes/medicine/visit-medicine';
-import { VisitsService } from '../../../services/visits/visits.service';
-import { AuthenticationService } from '../../../services/authentication/authentication.service';
-import { DoctorsService } from '../../../services/doctors/doctors.service';
-import { ConstantMessages } from '../../../constants/messages';
+import { VisitMedicine } from '../../../../../classes/visit/visit-medicine/visit-medicine';
+import { VisitsService } from '../../../../../services/visits/visits.service';
+import { AuthenticationService } from '../../../../../services/authentication/authentication.service';
+import { DoctorsService } from '../../../../../services/doctors/doctors.service';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-create-visit',

Clinics.Frontend/src/app/components/doctor/search-for-medicine/search-for-medicine.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/create-visit/search-for-medicine/search-for-medicine.component.ts

 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { MedicinesService } from '../../../services/medicines/medicines.service';
-import { MedicineSearchResult } from '../../../classes/medicine/medicine-search-result';
+import { MedicinesService } from '../../../../../services/medicines/medicines.service';
+import { MedicineSearchResult } from '../../../../../classes/usecases/doctor-usecases/search-for-medicine/medicine-search-result';
 import { ToastrService } from 'ngx-toastr';
 import { Router } from '@angular/router';
 import { FormControl } from '@angular/forms';
 import { debounceTime, distinctUntilChanged, filter, switchMap } from 'rxjs';
-import { VisitMedicine } from '../../../classes/medicine/visit-medicine';
-import { ConstantMessages } from '../../../constants/messages';
+import { VisitMedicine } from '../../../../../classes/visit/visit-medicine/visit-medicine';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-search-for-medicine',

Clinics.Frontend/src/app/components/doctor/visit/visit.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/create-visit/visit/visit.component.ts

 import { Component, Input } from '@angular/core';
-import { VisitView } from '../../../classes/visit/visit-view';
+import { VisitView } from '../../../../../classes/visit/visit-view';
 
 @Component({
   selector: 'app-visit',

Clinics.Frontend/src/app/components/doctor/doctor-phone/doctor-phone.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/list-doctor-phones/doctor-phone/doctor-phone.component.ts

 import { Component, Input } from '@angular/core';
-import { DoctorPhone } from '../../../classes/doctor/phones/doctor-phone';
+import { DoctorPhone } from '../../../../../classes/doctor/doctor-phones/doctor-phone';
 
 @Component({
   selector: 'app-doctor-phone',

Clinics.Frontend/src/app/components/doctor/doctor-phones/doctor-phones.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/list-doctor-phones/doctor-phones/doctor-phones.component.ts

 import { Component, OnInit } from '@angular/core';
-import { Phone } from '../../../classes/doctor/doctor';
-import { DoctorsService } from '../../../services/doctors/doctors.service';
-import { AuthenticationService } from '../../../services/authentication/authentication.service';
+import { Phone } from '../../../../../classes/doctor/doctor';
+import { DoctorsService } from '../../../../../services/doctors/doctors.service';
+import { AuthenticationService } from '../../../../../services/authentication/authentication.service';
 import { ToastrService } from 'ngx-toastr';
-import { ConstantMessages } from '../../../constants/messages';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-doctor-phones',

Clinics.Frontend/src/app/components/doctor/history/history.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/list-visits-history/history/history.component.ts

 import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
-import { EmployeesDataService } from '../../../services/employees/employees-data.service';
+import { EmployeesDataService } from '../../../../../services/employees/employees-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ToastrService } from 'ngx-toastr';
-import { EmployeeData } from '../../../classes/employeeData/employee-data';
-import { VisitView } from '../../../classes/visit/visit-view';
-import { VisitsService } from '../../../services/visits/visits.service';
-import { ConstantMessages } from '../../../constants/messages';
+import { EmployeeData } from '../../../../../classes/employee/employee-data';
+import { VisitView } from '../../../../../classes/visit/visit-view';
+import { VisitsService } from '../../../../../services/visits/visits.service';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-history',

Clinics.Frontend/src/app/components/doctor/medicines/medicines.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/list-visits-history/medicines/medicines.component.ts

 import { Component, Input } from '@angular/core';
-import { MedicineView } from '../../../classes/medicine/medicine-view';
+import { MedicineView } from '../../../../../classes/usecases/doctor-usecases/search-for-medicine/medicine-view';
 
 @Component({
   selector: 'app-medicines',

Clinics.Frontend/src/app/components/doctor/ask-for-serial-number/ask-for-serial-number.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/shared/ask-for-serial-number/ask-for-serial-number.component.ts

 import { Component, Input, ViewChild } from '@angular/core';
-import { EmployeesDataService } from '../../../services/employees/employees-data.service';
+import { EmployeesDataService } from '../../../../../services/employees/employees-data.service';
 import { Router } from '@angular/router';
 import { NgForm } from '@angular/forms';
-import { DoctorsService } from '../../../services/doctors/doctors.service';
-import { AuthenticationService } from '../../../services/authentication/authentication.service';
-import { DoctorStatuses } from '../../../classes/doctor/doctor';
+import { DoctorsService } from '../../../../../services/doctors/doctors.service';
+import { AuthenticationService } from '../../../../../services/authentication/authentication.service';
+import { DoctorStatuses } from '../../../../../classes/doctor/doctor';
 
 @Component({
   selector: 'app-ask-for-serial-number',

Clinics.Frontend/src/app/components/doctor/doctor-dashboard/doctor-dashboard.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/shared/doctor-dashboard/doctor-dashboard.component.ts

 import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
-import { DoctorNotificationsService } from '../../../services/doctorsNotifications/doctor-notifications.service';
-import { AuthenticationService } from '../../../services/authentication/authentication.service';
+import { DoctorNotificationsService } from '../../../../../services/notifications/doctor-notifications/doctor-notifications.service';
+import { AuthenticationService } from '../../../../../services/authentication/authentication.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({

Clinics.Frontend/src/app/components/doctor/doctor-status/doctor-status.component.ts → Clinics.Frontend/src/app/components/usecases/doctor-usecases/show-status/doctor-status/doctor-status.component.ts

 import { Component, OnInit } from '@angular/core';
-import { AuthenticationService } from '../../../services/authentication/authentication.service';
-import { UserData } from '../../../classes/authentication/user-data';
+import { AuthenticationService } from '../../../../../services/authentication/authentication.service';
+import { UserData } from '../../../../../classes/authentication/user-data';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ToastrService } from 'ngx-toastr';
-import { DoctorsService } from '../../../services/doctors/doctors.service';
-import { ConstantMessages } from '../../../constants/messages';
+import { DoctorsService } from '../../../../../services/doctors/doctors.service';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-doctor-status',

Clinics.Frontend/src/app/components/receptionist/create-employee-form/create-employee-form.component.ts → Clinics.Frontend/src/app/components/usecases/receptionist-usecases/create-employee/create-employee-form/create-employee-form.component.ts

@@ -3,9 +3,9 @@ import { Component, ViewChild } from '@angular/core';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ToastrService } from 'ngx-toastr';
-import { EmployeeData } from '../../../classes/employeeData/employee-data';
-import { EmployeesDataService } from '../../../services/employees/employees-data.service';
-import { ConstantMessages } from '../../../constants/messages';
+import { EmployeeData } from '../../../../../classes/employee/employee-data';
+import { EmployeesDataService } from '../../../../../services/employees/employees-data.service';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-create-employee-form',

Clinics.Frontend/src/app/components/receptionist/create-witing-list-item-for-employee/create-witing-list-item-for-employee.component.ts → Clinics.Frontend/src/app/components/usecases/receptionist-usecases/create-waiting-list-item/create-witing-list-item-for-employee/create-witing-list-item-for-employee.component.ts

@@ -2,9 +2,9 @@ import { Component, Input, ViewChild } from '@angular/core';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ToastrService } from 'ngx-toastr';
-import { WaitingListService } from '../../../services/waitingList/waiting-list.service';
+import { WaitingListService } from '../../../../../services/waitingList/waiting-list.service';
 import { ViewportScroller } from '@angular/common';
-import { ConstantMessages } from '../../../constants/messages';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-create-witing-list-item-for-employee',

Clinics.Frontend/src/app/components/receptionist/doctor-item/doctor-item.component.ts → Clinics.Frontend/src/app/components/usecases/receptionist-usecases/list-doctors/doctor-item/doctor-item.component.ts

 import { Component, Input } from '@angular/core';
-import { Doctor, DoctorStatuses } from '../../../classes/doctor/doctor';
+import { Doctor } from '../../../../../classes/doctor/doctor';
+import { DoctorStatuses } from '../../../../../classes/doctor/doctor';
 
 @Component({
   selector: 'app-doctor-item',

Clinics.Frontend/src/app/components/receptionist/doctors/doctors.component.ts → Clinics.Frontend/src/app/components/usecases/receptionist-usecases/list-doctors/doctors/doctors.component.ts

-import { Component, Input, OnInit } from '@angular/core';
-import { DoctorsService } from '../../../services/doctors/doctors.service';
-import { Doctor } from '../../../classes/doctor/doctor';
+import { Component, OnInit } from '@angular/core';
+import { DoctorsService } from '../../../../../services/doctors/doctors.service';
+import { Doctor } from '../../../../../classes/doctor/doctor';
 import { ToastrService } from 'ngx-toastr';
-import { ConstantMessages } from '../../../constants/messages';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-doctors',

Clinics.Frontend/src/app/components/receptionist/waiting-list-item/waiting-list-item.component.ts → Clinics.Frontend/src/app/components/usecases/receptionist-usecases/list-waiting-list-items/waiting-list-item/waiting-list-item.component.ts

 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { WaitingListRecord } from '../../../classes/waitingList/waiting-list-record';
-import { WaitingListService } from '../../../services/waitingList/waiting-list.service';
+import { WaitingListRecord } from '../../../../../classes/waitingList/waiting-list-record';
+import { WaitingListService } from '../../../../../services/waitingList/waiting-list.service';
 import { ToastrService } from 'ngx-toastr';
-import { DoctorsService } from '../../../services/doctors/doctors.service';
-import { AuthenticationService } from '../../../services/authentication/authentication.service';
-import { UserData } from '../../../classes/authentication/user-data';
-import { Roles } from '../../../classes/authentication/roles';
-import { ConstantMessages } from '../../../constants/messages';
+import { DoctorsService } from '../../../../../services/doctors/doctors.service';
+import { AuthenticationService } from '../../../../../services/authentication/authentication.service';
+import { UserData } from '../../../../../classes/authentication/user-data';
+import { Roles } from '../../../../../classes/authentication/roles-constants/roles';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-waiting-list-item',

Clinics.Frontend/src/app/components/receptionist/waiting-list/waiting-list.component.ts → Clinics.Frontend/src/app/components/usecases/receptionist-usecases/list-waiting-list-items/waiting-list/waiting-list.component.ts

 import { Component, OnInit } from '@angular/core';
-import { WaitingListRecord } from '../../../classes/waitingList/waiting-list-record';
-import { WaitingListService } from '../../../services/waitingList/waiting-list.service';
+import { WaitingListRecord } from '../../../../../classes/waitingList/waiting-list-record';
+import { WaitingListService } from '../../../../../services/waitingList/waiting-list.service';
 import { ToastrService } from 'ngx-toastr';
-import { UserData } from '../../../classes/authentication/user-data';
-import { AuthenticationService } from '../../../services/authentication/authentication.service';
-import { Roles } from '../../../classes/authentication/roles';
-import { ConstantMessages } from '../../../constants/messages';
+import { UserData } from '../../../../../classes/authentication/user-data';
+import { AuthenticationService } from '../../../../../services/authentication/authentication.service';
+import { Roles } from '../../../../../classes/authentication/roles-constants/roles';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-waiting-list',

Clinics.Frontend/src/app/components/receptionist/employee-serial-number-pop-up/employee-serial-number-pop-up.component.ts → Clinics.Frontend/src/app/components/usecases/receptionist-usecases/shared/employee-serial-number-pop-up/employee-serial-number-pop-up.component.ts

 import { Component, Input, ViewChild } from '@angular/core';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
-import { ToastrService } from 'ngx-toastr';
-import { EmployeesDataService } from '../../../services/employees/employees-data.service';
+import { EmployeesDataService } from '../../../../../services/employees/employees-data.service';
 
 @Component({
   selector: 'app-employee-serial-number-pop-up',

Clinics.Frontend/src/app/components/receptionist/employee/employee.component.ts → Clinics.Frontend/src/app/components/usecases/receptionist-usecases/show-employee/employee/employee.component.ts

 import { ViewportScroller } from '@angular/common';
-import { AfterViewInit, Component, numberAttribute, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { NgForm } from '@angular/forms';
-import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ToastrService } from 'ngx-toastr';
-import { EmployeeData } from '../../../classes/employeeData/employee-data';
-import { EmployeesDataService } from '../../../services/employees/employees-data.service';
-import { ConstantMessages } from '../../../constants/messages';
+import { EmployeeData } from '../../../../../classes/employee/employee-data';
+import { EmployeesDataService } from '../../../../../services/employees/employees-data.service';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-employee',

Clinics.Frontend/src/app/components/authentication/login-form/login-form.component.ts → Clinics.Frontend/src/app/components/usecases/shared-usecases/login/login-form/login-form.component.ts

 import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { NgForm } from '@angular/forms';
-import { LoginCommand } from '../../../classes/authentication/Login/login-command';
-import { AuthenticationService } from '../../../services/authentication/authentication.service';
-import { UserData } from '../../../classes/authentication/user-data';
+import { LoginCommand } from '../../../../../classes/usecases/shared-usecases/login/login-command';
+import { AuthenticationService } from '../../../../../services/authentication/authentication.service';
+import { UserData } from '../../../../../classes/authentication/user-data';
 import { ToastrService } from 'ngx-toastr';
-import { ConstantMessages } from '../../../constants/messages';
+import { ConstantMessages } from '../../../../../constants/messages';
 
 @Component({
   selector: 'app-login-form',

Clinics.Frontend/src/app/services/authentication/authentication.service.ts

@@ -3,12 +3,12 @@ import { AppModule } from '../../app.module';
 import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http';
 import * as config from "../../../../config";
 import { catchError, map, Observable, of } from 'rxjs';
-import { JWTHandler } from './jwtHandler';
-import { LoginCommand } from '../../classes/authentication/Login/login-command';
-import { LoginResponse } from '../../classes/authentication/Login/login-response';
-import { LoginResult } from '../../classes/authentication/Login/login-result';
+import { JWTHandler } from './jwt/jwtHandler';
+import { LoginCommand } from '../../classes/usecases/shared-usecases/login/login-command';
+import { LoginResponse } from '../../classes/usecases/shared-usecases/login/login-response';
+import { LoginResult } from '../../classes/usecases/shared-usecases/login/login-result';
 import { UserData } from '../../classes/authentication/user-data';
-import { Roles } from '../../classes/authentication/roles';
+import { Roles } from '../../classes/authentication/roles-constants/roles';
 
 @Injectable({
   providedIn: AppModule

Clinics.Frontend/src/app/services/authentication/guards/role-guard.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router, CanActivateChild, GuardResult, MaybeAsync } from '@angular/router';
 import { AuthenticationService } from '../authentication.service';
 import { UserData } from '../../../classes/authentication/user-data';
-import { Roles } from '../../../classes/authentication/roles';
+import { Roles } from '../../../classes/authentication/roles-constants/roles';
 
 
 @Injectable({

Clinics.Frontend/src/app/services/authentication/interceptor/authentication.interceptor.ts

 import { Injectable } from '@angular/core';
 import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpHeaders } from '@angular/common/http';
-import { JWTHandler } from '../jwtHandler';
+import { JWTHandler } from '../jwt/jwtHandler';
 import { Observable } from 'rxjs';
 
 @Injectable()

Clinics.Frontend/src/app/services/admin/doctor-users.service.ts → Clinics.Frontend/src/app/services/doctor-users/doctor-users.service.ts

@@ -2,15 +2,15 @@ import { Injectable } from '@angular/core';
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { catchError, map, Observable, of } from 'rxjs';
 import * as config from '../../../../config'
-import { GetAllDoctorUsersResponse } from '../../classes/admin/get-all-doctor-users-response';
-import { GetAllDoctorUsersResult } from '../../classes/admin/get-all-doctor-users-result';
-import { CreateDoctorUserCommand } from '../../classes/admin/create-doctor-user-command';
-import { CreateDoctorUserResult } from '../../classes/admin/create-doctor-user-result';
-import { DoctorUserResponse } from '../../classes/admin/doctor-user-response';
-import { UpdateDoctorPersonalDataQuery } from '../../classes/admin/update-doctor-personal-data-query';
-import { UpdateDoctorPersonalDataResult } from '../../classes/admin/update-doctor-personal-data-result';
-import { UpdateDoctorUserDataResult } from '../../classes/admin/update-doctor-user-data-result';
-import { UpdateDoctorUserQuery } from '../../classes/admin/update-doctor-user-query';
+import { GetAllDoctorUsersResponse } from '../../classes/usecases/admin-usecases/list-doctor-users/get-all-doctor-users-response';
+import { GetAllDoctorUsersResult } from '../../classes/usecases/admin-usecases/list-doctor-users/get-all-doctor-users-result';
+import { CreateDoctorUserCommand } from '../../classes/usecases/admin-usecases/create-doctor-user/create-doctor-user-command';
+import { CreateDoctorUserResult } from '../../classes/usecases/admin-usecases/create-doctor-user/create-doctor-user-result';
+import { DoctorUserResponse } from '../../classes/usecases/admin-usecases/list-doctor-users/doctor-user-response';
+import { UpdateDoctorPersonalDataQuery } from '../../classes/usecases/admin-usecases/update-doctor-user/update-doctor-user-personal-data/update-doctor-personal-data-query';
+import { UpdateDoctorPersonalDataResult } from '../../classes/usecases/admin-usecases/update-doctor-user/update-doctor-user-personal-data/update-doctor-personal-data-result';
+import { UpdateDoctorUserDataResult } from '../../classes/usecases/admin-usecases/update-doctor-user/update-doctor-user-account-data/update-doctor-user-data-result';
+import { UpdateDoctorUserQuery } from '../../classes/usecases/admin-usecases/update-doctor-user/update-doctor-user-account-data/update-doctor-user-query';
 
 
 @Injectable({

Clinics.Frontend/src/app/services/doctors/doctors.service.ts

@@ -3,9 +3,7 @@ import { Injectable } from '@angular/core';
 import * as config from '../../../../config';
 import { catchError, map, Observable, of } from 'rxjs';
 import { Doctor } from '../../classes/doctor/doctor';
-import { AuthenticationService } from '../authentication/authentication.service';
-import { DoctorPhone } from '../../classes/doctor/phones/doctor-phone';
-import { HttpError } from '@microsoft/signalr';
+import { DoctorPhone } from '../../classes/doctor/doctor-phones/doctor-phone';
 
 @Injectable({
   providedIn: 'root'

Clinics.Frontend/src/app/services/employees/employees-data.service.ts

 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import * as config from '../../../../config';
-import { EmployeeData } from '../../classes/employeeData/employee-data';
+import { EmployeeData } from '../../classes/employee/employee-data';
 import { catchError, map, Observable, of } from 'rxjs';
 
 @Injectable({

Clinics.Frontend/src/app/services/medicines/medicines.service.ts

@@ -2,7 +2,7 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import * as config from '../../../../config';
 import { catchError, map, Observable, of } from 'rxjs';
-import { MedicineSearchResult } from '../../classes/medicine/medicine-search-result';
+import { MedicineSearchResult } from '../../classes/usecases/doctor-usecases/search-for-medicine/medicine-search-result';
 @Injectable({
   providedIn: 'root'
 })

Clinics.Frontend/src/app/services/doctorsNotifications/doctor-notifications.service.ts → Clinics.Frontend/src/app/services/notifications/doctor-notifications/doctor-notifications.service.ts

 import { Injectable } from '@angular/core';
 import { HubConnectionBuilder } from '@microsoft/signalr';
-import * as config from '../../../../config'
+import * as config from '../../../../../config';
 
 @Injectable({
   providedIn: 'root'

Clinics.Frontend/src/app/services/notifications/signal-r.service.ts

-import { Injectable } from '@angular/core';
-import { HubConnectionBuilder } from '@microsoft/signalr';
-import * as config from '../../../../config'
-
-@Injectable({
-  providedIn: 'root'
-})
-export class SignalRService {
-
-  constructor() { }
-
-  private readonly NOTIFICATIONS_ENDPOINT: string = `${config.apiUrl}/Notifications`
-  hubConnection: signalR.HubConnection;
-
-  startConnection(): void {
-    this.hubConnection = new HubConnectionBuilder()
-      .withUrl(this.NOTIFICATIONS_ENDPOINT)
-      .build();
-
-    this.hubConnection
-      .start()
-      .then(() => {
-        console.log('Connected to signalR!')
-      })
-      .catch(err => console.error('Error while starting connection: ' + err))
-  }
-
-  endConnection(): void {
-    if (this.hubConnection) {
-      this.hubConnection
-        .stop()
-        .then(() => {
-          console.log('disonnected from signalR!');
-        })
-        .catch(err => console.error('Error while stopping connection: ' + err));
-    } else {
-      console.log('No active connection to stop.');
-    }
-  
-  }
-}
\ No newline at end of file

Clinics.Frontend/src/app/services/admin/receptionist-users.service.ts → Clinics.Frontend/src/app/services/receptionist-users/receptionist-users.service.ts

@@ -2,8 +2,8 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import * as config from '../../../../config';
 import { catchError, map, Observable, of } from 'rxjs';
-import { GetAllReceptionistUsersResult } from '../../classes/admin/get-all-receptionist-users-result';
-import { ReceptionistUser } from '../../classes/admin/receptionist-user';
+import { GetAllReceptionistUsersResult } from '../../classes/usecases/admin-usecases/list-receptionist-users/get-all-receptionist-users-result';
+import { ReceptionistUser } from '../../classes/usecases/admin-usecases/list-receptionist-users/receptionist-user';
 
 @Injectable({
   providedIn: 'root'

Clinics.Frontend/src/app/services/visits/visits.service.ts

@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import * as config from '../../../../config';
 import { catchError, map, Observable, of } from 'rxjs';
 import { VisitView } from '../../classes/visit/visit-view';
-import { VisitMedicine } from '../../classes/medicine/visit-medicine';
+import { VisitMedicine } from '../../classes/visit/visit-medicine/visit-medicine';
 
 @Injectable({
   providedIn: 'root'