diff --git a/kibicara-frontend/src/app/app-routing.module.ts b/kibicara-frontend/src/app/app-routing.module.ts
index 18ed158..d654d77 100644
--- a/kibicara-frontend/src/app/app-routing.module.ts
+++ b/kibicara-frontend/src/app/app-routing.module.ts
@@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { NotFoundComponent } from './shared/not-found/not-found.component';
 import { HomepageComponent } from './homepage/homepage.component';
-import { LoginComponent } from './auth/login/login.component';
-import { RegisterComponent } from './auth/register/register.component';
+import { LoginComponent } from './login/login.component';
+import { RegisterComponent } from './register/register.component';
 import { OrganizerspageComponent } from './organizerspage/organizerspage.component';
 import { HoodspageComponent } from './hoodspage/hoodspage.component';
 import { HoodpageComponent } from './hoodpage/hoodpage.component';
diff --git a/kibicara-frontend/src/app/app.module.ts b/kibicara-frontend/src/app/app.module.ts
index a225478..578a512 100644
--- a/kibicara-frontend/src/app/app.module.ts
+++ b/kibicara-frontend/src/app/app.module.ts
@@ -6,14 +6,16 @@ import { AppComponent } from './app.component';
 import { SharedModule } from './shared/shared.module';
 import { HomepageComponent } from './homepage/homepage.component';
 import { OrganizerspageComponent } from './organizerspage/organizerspage.component';
-import { AuthModule } from './auth/auth.module';
 import { DashboardModule } from './dashboard/dashboard.module';
 import { HoodpageComponent } from './hoodpage/hoodpage.component';
 import { HoodspageComponent } from './hoodspage/hoodspage.component';
-import { ApiModule } from './api/api.module';
+import { ApiModule } from './core/api/api.module';
 import { HttpClientModule } from '@angular/common/http';
-import { BASE_PATH } from './api/variables';
+import { BASE_PATH } from './core/api/variables';
 import { environment } from 'src/environments/environment';
+import { LoginComponent } from './login/login.component';
+import { RegisterComponent } from './register/register.component';
+import { ReactiveFormsModule } from '@angular/forms';
 
 @NgModule({
   declarations: [
@@ -22,15 +24,17 @@ import { environment } from 'src/environments/environment';
     OrganizerspageComponent,
     HoodpageComponent,
     HoodspageComponent,
+    LoginComponent,
+    RegisterComponent,
   ],
   imports: [
     BrowserModule,
     AppRoutingModule,
     SharedModule,
-    AuthModule,
     DashboardModule,
     ApiModule,
     HttpClientModule,
+    ReactiveFormsModule,
   ],
   providers: [{ provide: BASE_PATH, useValue: environment.API_BASE_PATH }],
   bootstrap: [AppComponent],
diff --git a/kibicara-frontend/src/app/hoodspage/hoodspage.component.ts b/kibicara-frontend/src/app/hoodspage/hoodspage.component.ts
index 9d700d0..fd95b3c 100644
--- a/kibicara-frontend/src/app/hoodspage/hoodspage.component.ts
+++ b/kibicara-frontend/src/app/hoodspage/hoodspage.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { HoodsService } from '../api/api/hoods.service';
+import { HoodsService } from '../core/api/api/hoods.service';
 
 @Component({
   selector: 'app-hoodspage',