diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 74978e4..e6565b8 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Symfony\Component\HttpFoundation\Response;
-use App\Services\AuthService;
+use App\Services\Data\AuthService;
 use Illuminate\Http\Request;
 
 class AuthController extends Controller
diff --git a/app/Http/Controllers/DashController.php b/app/Http/Controllers/DashController.php
index 41199c7..94eaf1c 100644
--- a/app/Http/Controllers/DashController.php
+++ b/app/Http/Controllers/DashController.php
@@ -3,9 +3,9 @@
 namespace App\Http\Controllers;
 
 use App\Interfaces\PageRepositoryInterface;
-use App\Services\AuthService;
-use App\Services\ThemeService;
-use App\Services\SortingService;
+use App\Services\Data\AuthService;
+use App\Services\Data\ThemeService;
+use App\Services\Data\SortingService;
 
 class DashController extends Controller
 {
diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php
index 4233e73..6914cf8 100644
--- a/app/Http/Controllers/FrontController.php
+++ b/app/Http/Controllers/FrontController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use App\Services\SettingsService;
-use App\Services\AuthService;
 use App\Interfaces\PageRepositoryInterface;
-use App\Services\SortingService;
-use App\Services\AssetService;
+use App\Services\Assets\AssetService;
+use App\Services\Data\SettingsService;
+use App\Services\Data\AuthService;
+use App\Services\Data\SortingService;
 
 use function _\find;
 
diff --git a/app/Http/Controllers/RouteController.php b/app/Http/Controllers/RouteController.php
index 200e6cf..fbe3f93 100644
--- a/app/Http/Controllers/RouteController.php
+++ b/app/Http/Controllers/RouteController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Services\AuthService;
+use App\Services\Data\AuthService;
 use Illuminate\Http\Request;
 
 class RouteController extends Controller
diff --git a/app/Http/Controllers/ThemeController.php b/app/Http/Controllers/ThemeController.php
index 82a518a..5524588 100644
--- a/app/Http/Controllers/ThemeController.php
+++ b/app/Http/Controllers/ThemeController.php
@@ -3,10 +3,10 @@
 namespace App\Http\Controllers;
 
 use App\Interfaces\PageRepositoryInterface;
-use App\Services\AuthService;
-use App\Services\SortingService;
-use App\Services\AssetService;
-use App\Services\ThemeService;
+use App\Services\Assets\AssetService;
+use App\Services\Data\AuthService;
+use App\Services\Data\SortingService;
+use App\Services\Data\ThemeService;
 
 class ThemeController extends Controller
 {
diff --git a/app/Providers/FipamoServiceProvider.php b/app/Providers/FipamoServiceProvider.php
index 4ee4b58..1fa80ab 100644
--- a/app/Providers/FipamoServiceProvider.php
+++ b/app/Providers/FipamoServiceProvider.php
@@ -3,20 +3,24 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+//Repos
 use App\Repositories\PageRepository;
 use App\Interfaces\PageRepositoryInterface;
-use App\Services\SettingsService;
-use App\Services\AuthService;
-use App\Services\ContentService;
-use App\Services\PaginateService;
-use App\Services\ThemeService;
-use App\Services\DocService;
-use App\Services\FileUploadService;
-use App\Services\RenderService;
-use App\Services\SortingService;
-use App\Services\AssetService;
-use App\Services\MaintenanceService;
-use App\Services\InitService;
+//Asset Services
+use App\Services\Assets\AssetService;
+use App\Services\Assets\DocService;
+use App\Services\Assets\FileUploadService;
+use App\Services\Assets\RenderService;
+//Data Services
+use App\Services\Data\SettingsService;
+use App\Services\Data\AuthService;
+use App\Services\Data\ContentService;
+use App\Services\Data\PaginateService;
+use App\Services\Data\ThemeService;
+use App\Services\Data\SortingService;
+//Upkeep Services
+use App\Services\UpKeep\MaintenanceService;
+use App\Services\UpKeep\InitService;
 
 class FipamoServiceProvider extends ServiceProvider
 {
diff --git a/app/Repositories/PageRepository.php b/app/Repositories/PageRepository.php
index d2df3ec..6afbfb3 100644
--- a/app/Repositories/PageRepository.php
+++ b/app/Repositories/PageRepository.php
@@ -3,12 +3,14 @@
 namespace App\Repositories;
 
 use App\Interfaces\PageRepositoryInterface;
-use App\Services\SettingsService;
-use App\Services\ContentService;
-use App\Services\PaginateService;
-use App\Services\DocService;
-use App\Services\SortingService;
-use App\Services\RenderService;
+//Asset Services
+use App\Services\Assets\DocService;
+use App\Services\Assets\RenderService;
+//Data Services
+use App\Services\Data\SettingsService;
+use App\Services\Data\ContentService;
+use App\Services\Data\PaginateService;
+use App\Services\Data\SortingService;
 use Carbon\Carbon;
 
 class PageRepository implements PageRepositoryInterface
diff --git a/app/Services/AssetService.php b/app/Services/Assets/AssetService.php
similarity index 98%
rename from app/Services/AssetService.php
rename to app/Services/Assets/AssetService.php
index c4e38f2..2162c26 100644
--- a/app/Services/AssetService.php
+++ b/app/Services/Assets/AssetService.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Assets;
+
+use App\Services\Data\ThemeService;
 
 class AssetService
 {
diff --git a/app/Services/DocService.php b/app/Services/Assets/DocService.php
similarity index 99%
rename from app/Services/DocService.php
rename to app/Services/Assets/DocService.php
index 7e15c1a..7537355 100644
--- a/app/Services/DocService.php
+++ b/app/Services/Assets/DocService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Assets;
 
 class DocService
 {
diff --git a/app/Services/FileUploadService.php b/app/Services/Assets/FileUploadService.php
similarity index 98%
rename from app/Services/FileUploadService.php
rename to app/Services/Assets/FileUploadService.php
index 771b201..513a1f5 100644
--- a/app/Services/FileUploadService.php
+++ b/app/Services/Assets/FileUploadService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Assets;
 
 class FileUploadService
 {
diff --git a/app/Services/RenderService.php b/app/Services/Assets/RenderService.php
similarity index 96%
rename from app/Services/RenderService.php
rename to app/Services/Assets/RenderService.php
index e44d74a..66586d7 100644
--- a/app/Services/RenderService.php
+++ b/app/Services/Assets/RenderService.php
@@ -1,8 +1,11 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Assets;
 
 use Illuminate\Support\Facades\File;
+use App\Services\Data\SortingService;
+use App\Services\Data\SettingsService;
+use App\Services\Data\ContentService;
 
 class RenderService
 {
diff --git a/app/Services/AuthService.php b/app/Services/Data/AuthService.php
similarity index 98%
rename from app/Services/AuthService.php
rename to app/Services/Data/AuthService.php
index 3c59faf..4b6b30f 100644
--- a/app/Services/AuthService.php
+++ b/app/Services/Data/AuthService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Data;
 
 use ReallySimpleJWT\Token;
 
diff --git a/app/Services/ContentService.php b/app/Services/Data/ContentService.php
similarity index 99%
rename from app/Services/ContentService.php
rename to app/Services/Data/ContentService.php
index 2199b57..d832f8f 100644
--- a/app/Services/ContentService.php
+++ b/app/Services/Data/ContentService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Data;
 
 use HtmlSanitizer\SanitizerBuilder;
 use League\CommonMark\MarkdownConverter;
diff --git a/app/Services/PaginateService.php b/app/Services/Data/PaginateService.php
similarity index 98%
rename from app/Services/PaginateService.php
rename to app/Services/Data/PaginateService.php
index 509fa2f..1114bee 100644
--- a/app/Services/PaginateService.php
+++ b/app/Services/Data/PaginateService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Data;
 
 use function _\filter;
 
diff --git a/app/Services/SettingsService.php b/app/Services/Data/SettingsService.php
similarity index 99%
rename from app/Services/SettingsService.php
rename to app/Services/Data/SettingsService.php
index 7a896cc..6644a7a 100644
--- a/app/Services/SettingsService.php
+++ b/app/Services/Data/SettingsService.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Data;
 
 use Carbon\Carbon;
+use App\Services\Assets\DocService;
 
 use function _\find;
 
diff --git a/app/Services/SortingService.php b/app/Services/Data/SortingService.php
similarity index 99%
rename from app/Services/SortingService.php
rename to app/Services/Data/SortingService.php
index 42b0644..9e0296a 100644
--- a/app/Services/SortingService.php
+++ b/app/Services/Data/SortingService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Data;
 
 use Carbon\Carbon;
 
diff --git a/app/Services/ThemeService.php b/app/Services/Data/ThemeService.php
similarity index 98%
rename from app/Services/ThemeService.php
rename to app/Services/Data/ThemeService.php
index a7ebf9c..3dece07 100644
--- a/app/Services/ThemeService.php
+++ b/app/Services/Data/ThemeService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Data;
 
 class ThemeService
 {
diff --git a/app/Services/InitService.php b/app/Services/Upkeep/InitService.php
similarity index 99%
rename from app/Services/InitService.php
rename to app/Services/Upkeep/InitService.php
index 21dbf4a..bc3215d 100644
--- a/app/Services/InitService.php
+++ b/app/Services/Upkeep/InitService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Upkeep;
 
 use ReallySimpleJWT\Token;
 use ReallySimpleJWT\Exception\BuildException;
diff --git a/app/Services/MaintenanceService.php b/app/Services/Upkeep/MaintenanceService.php
similarity index 100%
rename from app/Services/MaintenanceService.php
rename to app/Services/Upkeep/MaintenanceService.php
diff --git a/resources/views/includes/options.blade.php b/resources/views/includes/options.blade.php
index 657aa53..3244e5b 100644
--- a/resources/views/includes/options.blade.php
+++ b/resources/views/includes/options.blade.php
@@ -31,7 +31,7 @@ if(isset($page['uuid']))
 
 @endphp
 
-<br>
+<div role="toolbar" aria-label="page options" aria-orientation="horizontal">
     <button id="option-menu-pin" class="option-inactive post-option-btn" data-active="{{ $menu }}" title='Pin to Menu' aria-label="pin to menu">
         <svg id="option-menu-pin" class="icon">
             <use id="option-menu-pin" xlink:href="/assets/images/global/sprite.svg#entypo-pin"/>
@@ -50,3 +50,4 @@ if(isset($page['uuid']))
             </svg>
         </button>
     </a>
+</div>