diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index cb208a6..b8176ce 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -10,8 +10,8 @@ import {
 import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
 import { RouteTransitionAnimations } from './app.animation';
 import { PRouteData } from './models/dto/picsur-routes.dto';
-import { UtilService } from './util/util.service';
-let b = 0;
+import { UtilService } from './util/util-module/util.service';
+
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index ca1b89d..c78695a 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -8,7 +8,7 @@ import { AppRoutingModule } from './app.routing.module';
 import { FooterModule } from './components/footer/footer.module';
 import { HeaderModule } from './components/header/header.module';
 import { GuardsModule } from './guards/guards.module';
-import { UtilModule } from './util/util.module';
+import { UtilModule } from './util/util-module/util.module';
 
 @NgModule({
   declarations: [AppComponent],
diff --git a/frontend/src/app/components/copyfield/copyfield.component.html b/frontend/src/app/components/copy-field/copy-field.component.html
similarity index 100%
rename from frontend/src/app/components/copyfield/copyfield.component.html
rename to frontend/src/app/components/copy-field/copy-field.component.html
diff --git a/frontend/src/app/components/copyfield/copyfield.component.scss b/frontend/src/app/components/copy-field/copy-field.component.scss
similarity index 100%
rename from frontend/src/app/components/copyfield/copyfield.component.scss
rename to frontend/src/app/components/copy-field/copy-field.component.scss
diff --git a/frontend/src/app/components/copyfield/copyfield.component.ts b/frontend/src/app/components/copy-field/copy-field.component.ts
similarity index 78%
rename from frontend/src/app/components/copyfield/copyfield.component.ts
rename to frontend/src/app/components/copy-field/copy-field.component.ts
index 628cc7f..6865e58 100644
--- a/frontend/src/app/components/copyfield/copyfield.component.ts
+++ b/frontend/src/app/components/copy-field/copy-field.component.ts
@@ -1,12 +1,12 @@
 import { Clipboard } from '@angular/cdk/clipboard';
 import { Component, Input } from '@angular/core';
 import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 
 @Component({
-  selector: 'copyfield',
-  templateUrl: './copyfield.component.html',
-  styleUrls: ['./copyfield.component.scss'],
+  selector: 'copy-field',
+  templateUrl: './copy-field.component.html',
+  styleUrls: ['./copy-field.component.scss'],
 })
 export class CopyFieldComponent {
   // Two parameters: name, value
diff --git a/frontend/src/app/components/copyfield/copyfield.module.ts b/frontend/src/app/components/copy-field/copy-field.module.ts
similarity index 90%
rename from frontend/src/app/components/copyfield/copyfield.module.ts
rename to frontend/src/app/components/copy-field/copy-field.module.ts
index fc41dcd..8810dcc 100644
--- a/frontend/src/app/components/copyfield/copyfield.module.ts
+++ b/frontend/src/app/components/copy-field/copy-field.module.ts
@@ -4,7 +4,7 @@ import { NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
-import { CopyFieldComponent } from './copyfield.component';
+import { CopyFieldComponent } from './copy-field.component';
 @NgModule({
   declarations: [CopyFieldComponent],
   imports: [
diff --git a/frontend/src/app/components/header/header.component.ts b/frontend/src/app/components/header/header.component.ts
index 0ead576..0c6c18c 100644
--- a/frontend/src/app/components/header/header.component.ts
+++ b/frontend/src/app/components/header/header.component.ts
@@ -7,7 +7,7 @@ import { HasFailed } from 'picsur-shared/dist/types';
 import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
 import { PermissionService } from 'src/app/services/api/permission.service';
 import { UserService } from 'src/app/services/api/user.service';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 
 @Component({
   selector: 'app-header',
diff --git a/frontend/src/app/components/pref-option/pref-option.component.ts b/frontend/src/app/components/pref-option/pref-option.component.ts
index b65e5cc..ed72895 100644
--- a/frontend/src/app/components/pref-option/pref-option.component.ts
+++ b/frontend/src/app/components/pref-option/pref-option.component.ts
@@ -9,7 +9,7 @@ import { Subject } from 'rxjs';
 import { Required } from 'src/app/models/decorators/required.decorator';
 import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
 import { Throttle } from 'src/app/util/throttle';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 
 @Component({
   selector: 'pref-option',
diff --git a/frontend/src/app/i18n/syspref.i18n.ts b/frontend/src/app/i18n/sys-pref.i18n.ts
similarity index 100%
rename from frontend/src/app/i18n/syspref.i18n.ts
rename to frontend/src/app/i18n/sys-pref.i18n.ts
diff --git a/frontend/src/app/i18n/usrpref.i18n.ts b/frontend/src/app/i18n/usr-pref.i18n.ts
similarity index 100%
rename from frontend/src/app/i18n/usrpref.i18n.ts
rename to frontend/src/app/i18n/usr-pref.i18n.ts
diff --git a/frontend/src/app/models/dto/processing-view-meta.dto.ts b/frontend/src/app/models/dto/processing-view-meta.dto.ts
new file mode 100644
index 0000000..6a402fa
--- /dev/null
+++ b/frontend/src/app/models/dto/processing-view-meta.dto.ts
@@ -0,0 +1,3 @@
+export interface ProcessingViewMeta {
+  imageFile: File;
+}
diff --git a/frontend/src/app/models/dto/processing-view-metadata.dto.ts b/frontend/src/app/models/dto/processing-view-metadata.dto.ts
deleted file mode 100644
index 002f108..0000000
--- a/frontend/src/app/models/dto/processing-view-metadata.dto.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface ProcessingViewMetadata {
-  imageFile: File;
-}
diff --git a/frontend/src/app/models/forms/updaterole.control.ts b/frontend/src/app/models/forms/update-role.control.ts
similarity index 100%
rename from frontend/src/app/models/forms/updaterole.control.ts
rename to frontend/src/app/models/forms/update-role.control.ts
diff --git a/frontend/src/app/models/forms/updateuser.control.ts b/frontend/src/app/models/forms/update-user.control.ts
similarity index 100%
rename from frontend/src/app/models/forms/updateuser.control.ts
rename to frontend/src/app/models/forms/update-user.control.ts
diff --git a/frontend/src/app/routes/processing/processing.component.ts b/frontend/src/app/routes/processing/processing.component.ts
index a805ece..73f754e 100644
--- a/frontend/src/app/routes/processing/processing.component.ts
+++ b/frontend/src/app/routes/processing/processing.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { HasFailed } from 'picsur-shared/dist/types';
-import { ProcessingViewMetadata } from 'src/app/models/dto/processing-view-metadata.dto';
+import { ProcessingViewMeta } from 'src/app/models/dto/processing-view-meta.dto';
 import { ImageService } from 'src/app/services/api/image.service';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 
 @Component({
   templateUrl: './processing.component.html',
@@ -16,7 +16,7 @@ export class ProcessingComponent implements OnInit {
   ) {}
 
   async ngOnInit() {
-    const state = history.state as ProcessingViewMetadata;
+    const state = history.state as ProcessingViewMeta;
     if (!state) {
       return this.utilService.quitError('Error');
     }
diff --git a/frontend/src/app/routes/settings/general/settings-general.component.ts b/frontend/src/app/routes/settings/general/settings-general.component.ts
index 1b22591..4c96970 100644
--- a/frontend/src/app/routes/settings/general/settings-general.component.ts
+++ b/frontend/src/app/routes/settings/general/settings-general.component.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 import { DecodedPref } from 'picsur-shared/dist/dto/preferences.dto';
 import { Observable } from 'rxjs';
-import { UsrPreferenceFriendlyNames } from 'src/app/i18n/usrpref.i18n';
-import { UsrPrefService } from 'src/app/services/api/usrpref.service';
+import { UsrPreferenceFriendlyNames } from 'src/app/i18n/usr-pref.i18n';
+import { UsrPrefService } from 'src/app/services/api/usr-pref.service';
 
 @Component({
   templateUrl: './settings-general.component.html',
diff --git a/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts b/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts
index 36b93ef..5e97f86 100644
--- a/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts
+++ b/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts
@@ -4,11 +4,11 @@ import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { HasFailed } from 'picsur-shared/dist/types';
 import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
 import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
-import { UpdateRoleControl } from 'src/app/models/forms/updaterole.control';
+import { UpdateRoleControl } from 'src/app/models/forms/update-role.control';
 import { RolesService } from 'src/app/services/api/roles.service';
 import { StaticInfoService } from 'src/app/services/api/static-info.service';
 import { Logger } from 'src/app/services/logger/logger.service';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 
 enum EditMode {
   edit = 'edit',
diff --git a/frontend/src/app/routes/settings/roles/settings-roles.component.ts b/frontend/src/app/routes/settings/roles/settings-roles.component.ts
index 727326b..1f2c5de 100644
--- a/frontend/src/app/routes/settings/roles/settings-roles.component.ts
+++ b/frontend/src/app/routes/settings/roles/settings-roles.component.ts
@@ -10,7 +10,7 @@ import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
 import { RolesService } from 'src/app/services/api/roles.service';
 import { StaticInfoService } from 'src/app/services/api/static-info.service';
 import { Logger } from 'src/app/services/logger/logger.service';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 
 @Component({
   templateUrl: './settings-roles.component.html',
diff --git a/frontend/src/app/routes/settings/settings.routing.module.ts b/frontend/src/app/routes/settings/settings.routing.module.ts
index 2ca2187..2b9d8b1 100644
--- a/frontend/src/app/routes/settings/settings.routing.module.ts
+++ b/frontend/src/app/routes/settings/settings.routing.module.ts
@@ -7,7 +7,7 @@ import { SidebarResolverService } from 'src/app/services/sidebar-resolver/sideba
 import { SettingsGeneralRouteModule } from './general/settings-general.module';
 import { SettingsRolesRouteModule } from './roles/settings-roles.module';
 import { SettingsSidebarComponent } from './sidebar/settings-sidebar.component';
-import { SettingsSysprefRouteModule } from './syspref/settings-syspref.module';
+import { SettingsSysprefRouteModule } from './sys-pref/settings-sys-pref.module';
 import { SettingsUsersRouteModule } from './users/settings-users.module';
 
 const SettingsRoutes: PRoutes = [
diff --git a/frontend/src/app/routes/settings/syspref/settings-syspref.component.html b/frontend/src/app/routes/settings/sys-pref/settings-sys-pref.component.html
similarity index 100%
rename from frontend/src/app/routes/settings/syspref/settings-syspref.component.html
rename to frontend/src/app/routes/settings/sys-pref/settings-sys-pref.component.html
diff --git a/frontend/src/app/routes/settings/syspref/settings-syspref.component.ts b/frontend/src/app/routes/settings/sys-pref/settings-sys-pref.component.ts
similarity index 67%
rename from frontend/src/app/routes/settings/syspref/settings-syspref.component.ts
rename to frontend/src/app/routes/settings/sys-pref/settings-sys-pref.component.ts
index 88a5085..1601fe1 100644
--- a/frontend/src/app/routes/settings/syspref/settings-syspref.component.ts
+++ b/frontend/src/app/routes/settings/sys-pref/settings-sys-pref.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
 import { DecodedPref } from 'picsur-shared/dist/dto/preferences.dto';
 import { Observable } from 'rxjs';
-import { SysPreferenceFriendlyNames } from 'src/app/i18n/syspref.i18n';
-import { SysPrefService } from 'src/app/services/api/syspref.service';
+import { SysPreferenceFriendlyNames } from 'src/app/i18n/sys-pref.i18n';
+import { SysPrefService } from 'src/app/services/api/sys-pref.service';
 
 @Component({
-  templateUrl: './settings-syspref.component.html',
+  templateUrl: './settings-sys-pref.component.html',
 })
 export class SettingsSysprefComponent {
   public translator = SysPreferenceFriendlyNames;
diff --git a/frontend/src/app/routes/settings/syspref/settings-syspref.module.ts b/frontend/src/app/routes/settings/sys-pref/settings-sys-pref.module.ts
similarity index 70%
rename from frontend/src/app/routes/settings/syspref/settings-syspref.module.ts
rename to frontend/src/app/routes/settings/sys-pref/settings-sys-pref.module.ts
index c188f0a..efd7cb9 100644
--- a/frontend/src/app/routes/settings/syspref/settings-syspref.module.ts
+++ b/frontend/src/app/routes/settings/sys-pref/settings-sys-pref.module.ts
@@ -1,8 +1,8 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { PrefOptionModule } from 'src/app/components/pref-option/pref-option.module';
-import { SettingsSysprefComponent } from './settings-syspref.component';
-import { SettingsSysprefRoutingModule } from './settings-syspref.routing.module';
+import { SettingsSysprefComponent } from './settings-sys-pref.component';
+import { SettingsSysprefRoutingModule } from './settings-sys-pref.routing.module';
 
 @NgModule({
   declarations: [SettingsSysprefComponent],
diff --git a/frontend/src/app/routes/settings/syspref/settings-syspref.routing.module.ts b/frontend/src/app/routes/settings/sys-pref/settings-sys-pref.routing.module.ts
similarity index 83%
rename from frontend/src/app/routes/settings/syspref/settings-syspref.routing.module.ts
rename to frontend/src/app/routes/settings/sys-pref/settings-sys-pref.routing.module.ts
index 934d8f8..c69943b 100644
--- a/frontend/src/app/routes/settings/syspref/settings-syspref.routing.module.ts
+++ b/frontend/src/app/routes/settings/sys-pref/settings-sys-pref.routing.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
-import { SettingsSysprefComponent } from './settings-syspref.component';
+import { SettingsSysprefComponent } from './settings-sys-pref.component';
 
 const routes: PRoutes = [
   {
diff --git a/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts b/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts
index 1604e76..a1906fd 100644
--- a/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts
+++ b/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts
@@ -5,12 +5,12 @@ import { ERole } from 'picsur-shared/dist/entities/role.entity';
 import { HasFailed } from 'picsur-shared/dist/types';
 import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
 import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
-import { UpdateUserControl } from 'src/app/models/forms/updateuser.control';
+import { UpdateUserControl } from 'src/app/models/forms/update-user.control';
 import { RolesService } from 'src/app/services/api/roles.service';
 import { StaticInfoService } from 'src/app/services/api/static-info.service';
-import { UserManageService } from 'src/app/services/api/usermanage.service';
+import { UserManageService } from 'src/app/services/api/user-manage.service';
 import { Logger } from 'src/app/services/logger/logger.service';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 
 enum EditMode {
   edit = 'edit',
diff --git a/frontend/src/app/routes/settings/users/settings-users.component.ts b/frontend/src/app/routes/settings/users/settings-users.component.ts
index c0d1dcd..002c35e 100644
--- a/frontend/src/app/routes/settings/users/settings-users.component.ts
+++ b/frontend/src/app/routes/settings/users/settings-users.component.ts
@@ -7,10 +7,10 @@ import { HasFailed } from 'picsur-shared/dist/types';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
 import { StaticInfoService } from 'src/app/services/api/static-info.service';
-import { UserManageService } from 'src/app/services/api/usermanage.service';
+import { UserManageService } from 'src/app/services/api/user-manage.service';
 import { Logger } from 'src/app/services/logger/logger.service';
 import { Throttle } from 'src/app/util/throttle';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 
 @Component({
   templateUrl: './settings-users.component.html',
diff --git a/frontend/src/app/routes/upload/upload.component.ts b/frontend/src/app/routes/upload/upload.component.ts
index f3ae7a1..c11a030 100644
--- a/frontend/src/app/routes/upload/upload.component.ts
+++ b/frontend/src/app/routes/upload/upload.component.ts
@@ -5,8 +5,8 @@ import { NgxDropzoneChangeEvent } from 'ngx-dropzone';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { debounceTime } from 'rxjs';
 import { PermissionService } from 'src/app/services/api/permission.service';
-import { UtilService } from 'src/app/util/util.service';
-import { ProcessingViewMetadata } from '../../models/dto/processing-view-metadata.dto';
+import { UtilService } from 'src/app/util/util-module/util.service';
+import { ProcessingViewMeta } from '../../models/dto/processing-view-meta.dto';
 
 @Component({
   templateUrl: './upload.component.html',
@@ -41,7 +41,7 @@ export class UploadComponent implements OnInit {
       );
     }
 
-    const metadata: ProcessingViewMetadata = {
+    const metadata: ProcessingViewMeta = {
       imageFile: event.addedFiles[0],
     };
     this.router.navigate(['/processing'], { state: metadata });
diff --git a/frontend/src/app/routes/user/login/login.component.ts b/frontend/src/app/routes/user/login/login.component.ts
index 96890f6..0c82460 100644
--- a/frontend/src/app/routes/user/login/login.component.ts
+++ b/frontend/src/app/routes/user/login/login.component.ts
@@ -8,7 +8,7 @@ import { UserPassModel } from 'src/app/models/forms-dto/userpass.dto';
 import { PermissionService } from 'src/app/services/api/permission.service';
 import { UserService } from 'src/app/services/api/user.service';
 import { Logger } from 'src/app/services/logger/logger.service';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 import { LoginControl } from '../../../models/forms/login.control';
 
 @Component({
diff --git a/frontend/src/app/routes/user/register/register.component.ts b/frontend/src/app/routes/user/register/register.component.ts
index c74676d..533f139 100644
--- a/frontend/src/app/routes/user/register/register.component.ts
+++ b/frontend/src/app/routes/user/register/register.component.ts
@@ -8,7 +8,7 @@ import { UserPassModel } from 'src/app/models/forms-dto/userpass.dto';
 import { PermissionService } from 'src/app/services/api/permission.service';
 import { UserService } from 'src/app/services/api/user.service';
 import { Logger } from 'src/app/services/logger/logger.service';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 import { RegisterControl } from '../../../models/forms/register.control';
 
 @Component({
diff --git a/frontend/src/app/routes/view/view.component.html b/frontend/src/app/routes/view/view.component.html
index 549a4b4..6264f79 100644
--- a/frontend/src/app/routes/view/view.component.html
+++ b/frontend/src/app/routes/view/view.component.html
@@ -13,19 +13,19 @@
       </div>
 
       <div class="col-12">
-        <copyfield label="Image URL" [value]="imageLinks.source"></copyfield>
+        <copy-field label="Image URL" [value]="imageLinks.source"></copy-field>
       </div>
       <div class="col-md-6 col-12">
-        <copyfield label="Markdown" [value]="imageLinks.markdown"></copyfield>
+        <copy-field label="Markdown" [value]="imageLinks.markdown"></copy-field>
       </div>
       <div class="col-md-6 col-12">
-        <copyfield label="HTML" [value]="imageLinks.html"></copyfield>
+        <copy-field label="HTML" [value]="imageLinks.html"></copy-field>
       </div>
       <div class="col-md-6 col-12">
-        <copyfield label="BBCode" [value]="imageLinks.bbcode"></copyfield>
+        <copy-field label="BBCode" [value]="imageLinks.bbcode"></copy-field>
       </div>
       <div class="col-md-6 col-12">
-        <copyfield label="Rst" [value]="imageLinks.rst"></copyfield>
+        <copy-field label="Rst" [value]="imageLinks.rst"></copy-field>
       </div>
       <div class="col-12">
         <button
diff --git a/frontend/src/app/routes/view/view.component.ts b/frontend/src/app/routes/view/view.component.ts
index 4e9782e..a9f03d8 100644
--- a/frontend/src/app/routes/view/view.component.ts
+++ b/frontend/src/app/routes/view/view.component.ts
@@ -4,7 +4,7 @@ import { ImageLinks } from 'picsur-shared/dist/dto/image-links.dto';
 import { HasFailed } from 'picsur-shared/dist/types';
 import { UUIDRegex } from 'picsur-shared/dist/util/common-regex';
 import { ImageService } from 'src/app/services/api/image.service';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 
 @Component({
   templateUrl: './view.component.html',
diff --git a/frontend/src/app/routes/view/view.module.ts b/frontend/src/app/routes/view/view.module.ts
index ae3d1c3..73b1db0 100644
--- a/frontend/src/app/routes/view/view.module.ts
+++ b/frontend/src/app/routes/view/view.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
-import { CopyFieldModule } from 'src/app/components/copyfield/copyfield.module';
+import { CopyFieldModule } from 'src/app/components/copy-field/copy-field.module';
 import { PicsurImgModule } from 'src/app/components/picsur-img/picsur-img.module';
 import { ViewComponent } from './view.component';
 import { ViewRoutingModule } from './view.routing.module';
diff --git a/frontend/src/app/services/api/info.service.ts b/frontend/src/app/services/api/info.service.ts
index 5d33134..f40057a 100644
--- a/frontend/src/app/services/api/info.service.ts
+++ b/frontend/src/app/services/api/info.service.ts
@@ -7,7 +7,7 @@ import {
 import { SemVerRegex } from 'picsur-shared/dist/util/common-regex';
 import { BehaviorSubject } from 'rxjs';
 import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 import pkg from '../../../../package.json';
 import { ServerInfo } from '../../models/dto/server-info.dto';
 import { Logger } from '../logger/logger.service';
diff --git a/frontend/src/app/services/api/syspref.service.ts b/frontend/src/app/services/api/sys-pref.service.ts
similarity index 98%
rename from frontend/src/app/services/api/syspref.service.ts
rename to frontend/src/app/services/api/sys-pref.service.ts
index d1eebce..d996ad8 100644
--- a/frontend/src/app/services/api/syspref.service.ts
+++ b/frontend/src/app/services/api/sys-pref.service.ts
@@ -15,7 +15,7 @@ import { AsyncFailable, Fail, HasFailed, Map } from 'picsur-shared/dist/types';
 import { BehaviorSubject } from 'rxjs';
 import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
 import { Throttle } from 'src/app/util/throttle';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 import { Logger } from '../logger/logger.service';
 import { ApiService } from './api.service';
 import { PermissionService } from './permission.service';
diff --git a/frontend/src/app/services/api/usermanage.service.ts b/frontend/src/app/services/api/user-manage.service.ts
similarity index 100%
rename from frontend/src/app/services/api/usermanage.service.ts
rename to frontend/src/app/services/api/user-manage.service.ts
diff --git a/frontend/src/app/services/api/usrpref.service.ts b/frontend/src/app/services/api/usr-pref.service.ts
similarity index 98%
rename from frontend/src/app/services/api/usrpref.service.ts
rename to frontend/src/app/services/api/usr-pref.service.ts
index 529f001..2b15c5f 100644
--- a/frontend/src/app/services/api/usrpref.service.ts
+++ b/frontend/src/app/services/api/usr-pref.service.ts
@@ -15,7 +15,7 @@ import { AsyncFailable, Fail, HasFailed, Map } from 'picsur-shared/dist/types';
 import { BehaviorSubject } from 'rxjs';
 import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
 import { Throttle } from 'src/app/util/throttle';
-import { UtilService } from 'src/app/util/util.service';
+import { UtilService } from 'src/app/util/util-module/util.service';
 import { Logger } from '../logger/logger.service';
 import { ApiService } from './api.service';
 import { PermissionService } from './permission.service';
diff --git a/frontend/src/app/util/qoi/qoi-encode.ts b/frontend/src/app/util/qoi/qoi-encode.exclude.ts
similarity index 100%
rename from frontend/src/app/util/qoi/qoi-encode.ts
rename to frontend/src/app/util/qoi/qoi-encode.exclude.ts
diff --git a/frontend/src/app/util/apierror.service.ts b/frontend/src/app/util/util-module/api-error.service.ts
similarity index 80%
rename from frontend/src/app/util/apierror.service.ts
rename to frontend/src/app/util/util-module/api-error.service.ts
index cac7698..50af63c 100644
--- a/frontend/src/app/util/apierror.service.ts
+++ b/frontend/src/app/util/util-module/api-error.service.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
-import { SnackBarType } from '../models/dto/snack-bar-type.dto';
-import { ApiService } from '../services/api/api.service';
-import { Logger } from '../services/logger/logger.service';
+import { SnackBarType } from '../../models/dto/snack-bar-type.dto';
+import { ApiService } from '../../services/api/api.service';
+import { Logger } from '../../services/logger/logger.service';
 import { UtilService } from './util.service';
 
 @Injectable({
diff --git a/frontend/src/app/util/confirm-dialog/confirm-dialog.component.html b/frontend/src/app/util/util-module/confirm-dialog/confirm-dialog.component.html
similarity index 100%
rename from frontend/src/app/util/confirm-dialog/confirm-dialog.component.html
rename to frontend/src/app/util/util-module/confirm-dialog/confirm-dialog.component.html
diff --git a/frontend/src/app/util/confirm-dialog/confirm-dialog.component.scss b/frontend/src/app/util/util-module/confirm-dialog/confirm-dialog.component.scss
similarity index 100%
rename from frontend/src/app/util/confirm-dialog/confirm-dialog.component.scss
rename to frontend/src/app/util/util-module/confirm-dialog/confirm-dialog.component.scss
diff --git a/frontend/src/app/util/confirm-dialog/confirm-dialog.component.ts b/frontend/src/app/util/util-module/confirm-dialog/confirm-dialog.component.ts
similarity index 100%
rename from frontend/src/app/util/confirm-dialog/confirm-dialog.component.ts
rename to frontend/src/app/util/util-module/confirm-dialog/confirm-dialog.component.ts
diff --git a/frontend/src/app/util/util.module.ts b/frontend/src/app/util/util-module/util.module.ts
similarity index 95%
rename from frontend/src/app/util/util.module.ts
rename to frontend/src/app/util/util-module/util.module.ts
index ddb9767..0d5524f 100644
--- a/frontend/src/app/util/util.module.ts
+++ b/frontend/src/app/util/util-module/util.module.ts
@@ -7,7 +7,7 @@ import {
   MAT_SNACK_BAR_DEFAULT_OPTIONS
 } from '@angular/material/snack-bar';
 import { RouterModule } from '@angular/router';
-import { ApiErrorService } from './apierror.service';
+import { ApiErrorService } from './api-error.service';
 import { ConfirmDialogComponent } from './confirm-dialog/confirm-dialog.component';
 
 @NgModule({
diff --git a/frontend/src/app/util/util.service.ts b/frontend/src/app/util/util-module/util.service.ts
similarity index 96%
rename from frontend/src/app/util/util.service.ts
rename to frontend/src/app/util/util-module/util.service.ts
index 48e0e44..93856cb 100644
--- a/frontend/src/app/util/util.service.ts
+++ b/frontend/src/app/util/util-module/util.service.ts
@@ -4,7 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Router } from '@angular/router';
 import { map, Observable } from 'rxjs';
-import { SnackBarType } from '../models/dto/snack-bar-type.dto';
+import { SnackBarType } from '../../models/dto/snack-bar-type.dto';
 import {
   ConfirmDialogComponent,
   DialogData
diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json
index f7cf945..b97922e 100644
--- a/frontend/tsconfig.app.json
+++ b/frontend/tsconfig.app.json
@@ -10,6 +10,6 @@
     "lib": ["es2020", "dom"],
   },
   "files": ["src/main.ts", "src/polyfills.ts"],
-  "include": ["src/**/*.d.ts", "src/app/**/*.ts"],
-  "exclude": ["src/**/*.worker.ts"]
+  "include": ["src/**/*.d.ts", "src/app/**/*.ts", "src/app/util/qoi/qoi-encode.ts.disabled"],
+  "exclude": ["src/**/*.worker.ts", "src/**/*.exclude.ts"],
 }
diff --git a/frontend/tsconfig.worker.json b/frontend/tsconfig.worker.json
index c769c58..e5df713 100644
--- a/frontend/tsconfig.worker.json
+++ b/frontend/tsconfig.worker.json
@@ -7,5 +7,6 @@
 
     "isolatedModules": false
   },
-  "include": ["src/app/workers/*.worker.ts"]
+  "include": ["src/app/workers/*.worker.ts"],
+  "exclude": ["src/**/*.exclude.ts"],
 }