diff --git a/projects/rf2-better-ui/src/app/app.module.ts b/projects/rf2-better-ui/src/app/app.module.ts
index 30d5617..296f4c2 100644
--- a/projects/rf2-better-ui/src/app/app.module.ts
+++ b/projects/rf2-better-ui/src/app/app.module.ts
@@ -3,15 +3,15 @@ import { ApplicationRef, DoBootstrap, Injector, NgModule } from '@angular/core';
 import { HttpClientModule } from '@angular/common/http';
 
 import { createCustomElement } from '@angular/elements';
-import { RfButtonComponent } from './rf-button/rf-button.component';
-import { ChatComponent } from './chat/chat.component';
-import { BetterUiComponent } from './better-ui/better-ui.component';
-import { StartHandlerComponent } from './start-handler/start-handler.component';
-import { RaceHandlerComponent } from './race-handler/race-handler.component';
-import { GarageHandlerComponent } from './garage-handler/garage-handler.component';
-import { EventHandlerComponent } from './event-handler/event-handler.component';
-import { SessionsHandlerComponent } from './sessions-handler/sessions-handler.component';
-import { MultiplayerHandlerComponent } from './multiplayer-handler/multiplayer-handler.component';
+import { RfButtonComponent } from './components/rf-button/rf-button.component';
+import { ChatComponent } from './components/chat/chat.component';
+import { BetterUiComponent } from './components/better-ui/better-ui.component';
+import { StartHandlerComponent } from './components/start-handler/start-handler.component';
+import { RaceHandlerComponent } from './components/race-handler/race-handler.component';
+import { GarageHandlerComponent } from './components/garage-handler/garage-handler.component';
+import { EventHandlerComponent } from './components/event-handler/event-handler.component';
+import { SessionsHandlerComponent } from './components/sessions-handler/sessions-handler.component';
+import { MultiplayerHandlerComponent } from './components/multiplayer-handler/multiplayer-handler.component';
 
 @NgModule({
   imports: [
diff --git a/projects/rf2-better-ui/src/app/better-ui/better-ui.component.scss b/projects/rf2-better-ui/src/app/components/better-ui/better-ui.component.scss
similarity index 100%
rename from projects/rf2-better-ui/src/app/better-ui/better-ui.component.scss
rename to projects/rf2-better-ui/src/app/components/better-ui/better-ui.component.scss
diff --git a/projects/rf2-better-ui/src/app/better-ui/better-ui.component.spec.ts b/projects/rf2-better-ui/src/app/components/better-ui/better-ui.component.spec.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/better-ui/better-ui.component.spec.ts
rename to projects/rf2-better-ui/src/app/components/better-ui/better-ui.component.spec.ts
diff --git a/projects/rf2-better-ui/src/app/better-ui/better-ui.component.ts b/projects/rf2-better-ui/src/app/components/better-ui/better-ui.component.ts
similarity index 97%
rename from projects/rf2-better-ui/src/app/better-ui/better-ui.component.ts
rename to projects/rf2-better-ui/src/app/components/better-ui/better-ui.component.ts
index e3ffd69..0ba30d6 100644
--- a/projects/rf2-better-ui/src/app/better-ui/better-ui.component.ts
+++ b/projects/rf2-better-ui/src/app/components/better-ui/better-ui.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { version } from '../../../../../package.json';
+import { version } from '../../../../../../package.json';
 
 @Component({
   selector: 'rf-better-ui',
diff --git a/projects/rf2-better-ui/src/app/chat/chat.component.html b/projects/rf2-better-ui/src/app/components/chat/chat.component.html
similarity index 100%
rename from projects/rf2-better-ui/src/app/chat/chat.component.html
rename to projects/rf2-better-ui/src/app/components/chat/chat.component.html
diff --git a/projects/rf2-better-ui/src/app/chat/chat.component.scss b/projects/rf2-better-ui/src/app/components/chat/chat.component.scss
similarity index 100%
rename from projects/rf2-better-ui/src/app/chat/chat.component.scss
rename to projects/rf2-better-ui/src/app/components/chat/chat.component.scss
diff --git a/projects/rf2-better-ui/src/app/chat/chat.component.spec.ts b/projects/rf2-better-ui/src/app/components/chat/chat.component.spec.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/chat/chat.component.spec.ts
rename to projects/rf2-better-ui/src/app/components/chat/chat.component.spec.ts
diff --git a/projects/rf2-better-ui/src/app/chat/chat.component.ts b/projects/rf2-better-ui/src/app/components/chat/chat.component.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/chat/chat.component.ts
rename to projects/rf2-better-ui/src/app/components/chat/chat.component.ts
diff --git a/projects/rf2-better-ui/src/app/event-handler/event-handler.component.scss b/projects/rf2-better-ui/src/app/components/event-handler/event-handler.component.scss
similarity index 100%
rename from projects/rf2-better-ui/src/app/event-handler/event-handler.component.scss
rename to projects/rf2-better-ui/src/app/components/event-handler/event-handler.component.scss
diff --git a/projects/rf2-better-ui/src/app/event-handler/event-handler.component.spec.ts b/projects/rf2-better-ui/src/app/components/event-handler/event-handler.component.spec.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/event-handler/event-handler.component.spec.ts
rename to projects/rf2-better-ui/src/app/components/event-handler/event-handler.component.spec.ts
diff --git a/projects/rf2-better-ui/src/app/event-handler/event-handler.component.ts b/projects/rf2-better-ui/src/app/components/event-handler/event-handler.component.ts
similarity index 96%
rename from projects/rf2-better-ui/src/app/event-handler/event-handler.component.ts
rename to projects/rf2-better-ui/src/app/components/event-handler/event-handler.component.ts
index 3fcdc58..8efb714 100644
--- a/projects/rf2-better-ui/src/app/event-handler/event-handler.component.ts
+++ b/projects/rf2-better-ui/src/app/components/event-handler/event-handler.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
-import { waitForElement } from '../utils/utils';
+import { waitForElement } from '../../utils/utils';
 
 @Component({
   selector: 'rf-event-handler',
diff --git a/projects/rf2-better-ui/src/app/garage-handler/garage-handler.component.scss b/projects/rf2-better-ui/src/app/components/garage-handler/garage-handler.component.scss
similarity index 100%
rename from projects/rf2-better-ui/src/app/garage-handler/garage-handler.component.scss
rename to projects/rf2-better-ui/src/app/components/garage-handler/garage-handler.component.scss
diff --git a/projects/rf2-better-ui/src/app/garage-handler/garage-handler.component.spec.ts b/projects/rf2-better-ui/src/app/components/garage-handler/garage-handler.component.spec.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/garage-handler/garage-handler.component.spec.ts
rename to projects/rf2-better-ui/src/app/components/garage-handler/garage-handler.component.spec.ts
diff --git a/projects/rf2-better-ui/src/app/garage-handler/garage-handler.component.ts b/projects/rf2-better-ui/src/app/components/garage-handler/garage-handler.component.ts
similarity index 95%
rename from projects/rf2-better-ui/src/app/garage-handler/garage-handler.component.ts
rename to projects/rf2-better-ui/src/app/components/garage-handler/garage-handler.component.ts
index 45d59b2..86bd73c 100644
--- a/projects/rf2-better-ui/src/app/garage-handler/garage-handler.component.ts
+++ b/projects/rf2-better-ui/src/app/components/garage-handler/garage-handler.component.ts
@@ -1,5 +1,5 @@
 import { Component, HostListener, OnInit, ViewEncapsulation } from '@angular/core';
-import { arrowNavigation, waitForElement } from '../utils/utils';
+import { arrowNavigation, waitForElement } from '../../utils/utils';
 import { HttpClient } from '@angular/common/http';
 
 @Component({
diff --git a/projects/rf2-better-ui/src/app/multiplayer-handler/multiplayer-handler.component.scss b/projects/rf2-better-ui/src/app/components/multiplayer-handler/multiplayer-handler.component.scss
similarity index 100%
rename from projects/rf2-better-ui/src/app/multiplayer-handler/multiplayer-handler.component.scss
rename to projects/rf2-better-ui/src/app/components/multiplayer-handler/multiplayer-handler.component.scss
diff --git a/projects/rf2-better-ui/src/app/multiplayer-handler/multiplayer-handler.component.spec.ts b/projects/rf2-better-ui/src/app/components/multiplayer-handler/multiplayer-handler.component.spec.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/multiplayer-handler/multiplayer-handler.component.spec.ts
rename to projects/rf2-better-ui/src/app/components/multiplayer-handler/multiplayer-handler.component.spec.ts
diff --git a/projects/rf2-better-ui/src/app/multiplayer-handler/multiplayer-handler.component.ts b/projects/rf2-better-ui/src/app/components/multiplayer-handler/multiplayer-handler.component.ts
similarity index 96%
rename from projects/rf2-better-ui/src/app/multiplayer-handler/multiplayer-handler.component.ts
rename to projects/rf2-better-ui/src/app/components/multiplayer-handler/multiplayer-handler.component.ts
index 1c5c7f4..aebbbc9 100644
--- a/projects/rf2-better-ui/src/app/multiplayer-handler/multiplayer-handler.component.ts
+++ b/projects/rf2-better-ui/src/app/components/multiplayer-handler/multiplayer-handler.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
-import { waitForElement } from '../utils/utils';
+import { waitForElement } from '../../utils/utils';
 
 @Component({
   selector: 'rf-multiplayer-handler',
diff --git a/projects/rf2-better-ui/src/app/race-handler/race-handler.component.scss b/projects/rf2-better-ui/src/app/components/race-handler/race-handler.component.scss
similarity index 100%
rename from projects/rf2-better-ui/src/app/race-handler/race-handler.component.scss
rename to projects/rf2-better-ui/src/app/components/race-handler/race-handler.component.scss
diff --git a/projects/rf2-better-ui/src/app/race-handler/race-handler.component.spec.ts b/projects/rf2-better-ui/src/app/components/race-handler/race-handler.component.spec.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/race-handler/race-handler.component.spec.ts
rename to projects/rf2-better-ui/src/app/components/race-handler/race-handler.component.spec.ts
diff --git a/projects/rf2-better-ui/src/app/race-handler/race-handler.component.ts b/projects/rf2-better-ui/src/app/components/race-handler/race-handler.component.ts
similarity index 95%
rename from projects/rf2-better-ui/src/app/race-handler/race-handler.component.ts
rename to projects/rf2-better-ui/src/app/components/race-handler/race-handler.component.ts
index 99e25c5..55ee557 100644
--- a/projects/rf2-better-ui/src/app/race-handler/race-handler.component.ts
+++ b/projects/rf2-better-ui/src/app/components/race-handler/race-handler.component.ts
@@ -1,5 +1,5 @@
 import { Component, HostListener, OnInit, ViewEncapsulation } from '@angular/core';
-import { arrowNavigation, waitForElement } from '../utils/utils';
+import { arrowNavigation, waitForElement } from '../../utils/utils';
 
 @Component({
   selector: 'rf-race-handler',
diff --git a/projects/rf2-better-ui/src/app/rf-button/rf-button.component.html b/projects/rf2-better-ui/src/app/components/rf-button/rf-button.component.html
similarity index 100%
rename from projects/rf2-better-ui/src/app/rf-button/rf-button.component.html
rename to projects/rf2-better-ui/src/app/components/rf-button/rf-button.component.html
diff --git a/projects/rf2-better-ui/src/app/rf-button/rf-button.component.scss b/projects/rf2-better-ui/src/app/components/rf-button/rf-button.component.scss
similarity index 96%
rename from projects/rf2-better-ui/src/app/rf-button/rf-button.component.scss
rename to projects/rf2-better-ui/src/app/components/rf-button/rf-button.component.scss
index f01b2b1..9fcc04b 100644
--- a/projects/rf2-better-ui/src/app/rf-button/rf-button.component.scss
+++ b/projects/rf2-better-ui/src/app/components/rf-button/rf-button.component.scss
@@ -1,4 +1,4 @@
-@use "projects/rf2-better-ui/src/scss/common-styles" as common;
+@use "../../../scss/common-styles" as common;
 
 .primary {
   background: #000000;
diff --git a/projects/rf2-better-ui/src/app/rf-button/rf-button.component.spec.ts b/projects/rf2-better-ui/src/app/components/rf-button/rf-button.component.spec.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/rf-button/rf-button.component.spec.ts
rename to projects/rf2-better-ui/src/app/components/rf-button/rf-button.component.spec.ts
diff --git a/projects/rf2-better-ui/src/app/rf-button/rf-button.component.ts b/projects/rf2-better-ui/src/app/components/rf-button/rf-button.component.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/rf-button/rf-button.component.ts
rename to projects/rf2-better-ui/src/app/components/rf-button/rf-button.component.ts
diff --git a/projects/rf2-better-ui/src/app/sessions-handler/sessions-handler.component.scss b/projects/rf2-better-ui/src/app/components/sessions-handler/sessions-handler.component.scss
similarity index 100%
rename from projects/rf2-better-ui/src/app/sessions-handler/sessions-handler.component.scss
rename to projects/rf2-better-ui/src/app/components/sessions-handler/sessions-handler.component.scss
diff --git a/projects/rf2-better-ui/src/app/sessions-handler/sessions-handler.component.ts b/projects/rf2-better-ui/src/app/components/sessions-handler/sessions-handler.component.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/sessions-handler/sessions-handler.component.ts
rename to projects/rf2-better-ui/src/app/components/sessions-handler/sessions-handler.component.ts
diff --git a/projects/rf2-better-ui/src/app/start-handler/start-handler.component.scss b/projects/rf2-better-ui/src/app/components/start-handler/start-handler.component.scss
similarity index 100%
rename from projects/rf2-better-ui/src/app/start-handler/start-handler.component.scss
rename to projects/rf2-better-ui/src/app/components/start-handler/start-handler.component.scss
diff --git a/projects/rf2-better-ui/src/app/start-handler/start-handler.component.spec.ts b/projects/rf2-better-ui/src/app/components/start-handler/start-handler.component.spec.ts
similarity index 100%
rename from projects/rf2-better-ui/src/app/start-handler/start-handler.component.spec.ts
rename to projects/rf2-better-ui/src/app/components/start-handler/start-handler.component.spec.ts
diff --git a/projects/rf2-better-ui/src/app/start-handler/start-handler.component.ts b/projects/rf2-better-ui/src/app/components/start-handler/start-handler.component.ts
similarity index 92%
rename from projects/rf2-better-ui/src/app/start-handler/start-handler.component.ts
rename to projects/rf2-better-ui/src/app/components/start-handler/start-handler.component.ts
index 9bcbe59..52e67ad 100644
--- a/projects/rf2-better-ui/src/app/start-handler/start-handler.component.ts
+++ b/projects/rf2-better-ui/src/app/components/start-handler/start-handler.component.ts
@@ -1,5 +1,5 @@
 import { Component, HostListener, OnInit, ViewEncapsulation } from '@angular/core';
-import { arrowNavigation } from '../utils/utils';
+import { arrowNavigation } from '../../utils/utils';
 
 @Component({
   selector: 'rf-start-handler',