diff --git a/app/Http/Controllers/Company/General/FormatsController.php b/app/Http/Controllers/Company/General/FormatsController.php
index 9708c26a..9c8e9951 100644
--- a/app/Http/Controllers/Company/General/FormatsController.php
+++ b/app/Http/Controllers/Company/General/FormatsController.php
@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Company\General;
 
 use App\Http\Controllers\Controller;
-use App\Support\Formatters\DateFormatter;
-use App\Support\Formatters\TimeFormatter;
-use App\Support\Formatters\TimeZones;
+use App\Support\Formatting\DateFormatter;
+use App\Support\Formatting\TimeFormatter;
+use App\Support\Formatting\TimeZones;
 use Illuminate\Http\JsonResponse;
 
 class FormatsController extends Controller
diff --git a/app/Providers/DriverRegistryProvider.php b/app/Providers/DriverRegistryProvider.php
index 90b12aa4..521011f8 100644
--- a/app/Providers/DriverRegistryProvider.php
+++ b/app/Providers/DriverRegistryProvider.php
@@ -2,10 +2,10 @@
 
 namespace App\Providers;
 
-use App\Support\Integrations\ExchangeRate\CurrencyConverterDriver;
-use App\Support\Integrations\ExchangeRate\CurrencyFreakDriver;
-use App\Support\Integrations\ExchangeRate\CurrencyLayerDriver;
-use App\Support\Integrations\ExchangeRate\OpenExchangeRateDriver;
+use App\Support\ExchangeRate\CurrencyConverterDriver;
+use App\Support\ExchangeRate\CurrencyFreakDriver;
+use App\Support\ExchangeRate\CurrencyLayerDriver;
+use App\Support\ExchangeRate\OpenExchangeRateDriver;
 use Illuminate\Support\ServiceProvider;
 use InvoiceShelf\Modules\Registry;
 
diff --git a/app/Services/ExchangeRateProviderService.php b/app/Services/ExchangeRateProviderService.php
index e9d06684..f8c847dc 100644
--- a/app/Services/ExchangeRateProviderService.php
+++ b/app/Services/ExchangeRateProviderService.php
@@ -6,8 +6,8 @@ use App\Http\Requests\ExchangeRateProviderRequest;
 use App\Models\CompanySetting;
 use App\Models\ExchangeRateLog;
 use App\Models\ExchangeRateProvider;
-use App\Support\Integrations\ExchangeRate\ExchangeRateDriverFactory;
-use App\Support\Integrations\ExchangeRate\ExchangeRateException;
+use App\Support\ExchangeRate\ExchangeRateDriverFactory;
+use App\Support\ExchangeRate\ExchangeRateException;
 
 class ExchangeRateProviderService
 {
diff --git a/app/Support/Integrations/ExchangeRate/CurrencyConverterDriver.php b/app/Support/ExchangeRate/CurrencyConverterDriver.php
similarity index 97%
rename from app/Support/Integrations/ExchangeRate/CurrencyConverterDriver.php
rename to app/Support/ExchangeRate/CurrencyConverterDriver.php
index ac9a1ef8..0e0da118 100644
--- a/app/Support/Integrations/ExchangeRate/CurrencyConverterDriver.php
+++ b/app/Support/ExchangeRate/CurrencyConverterDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Integrations\ExchangeRate;
+namespace App\Support\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Support/Integrations/ExchangeRate/CurrencyFreakDriver.php b/app/Support/ExchangeRate/CurrencyFreakDriver.php
similarity index 97%
rename from app/Support/Integrations/ExchangeRate/CurrencyFreakDriver.php
rename to app/Support/ExchangeRate/CurrencyFreakDriver.php
index 1fe4a8ea..f5845e5b 100644
--- a/app/Support/Integrations/ExchangeRate/CurrencyFreakDriver.php
+++ b/app/Support/ExchangeRate/CurrencyFreakDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Integrations\ExchangeRate;
+namespace App\Support\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Support/Integrations/ExchangeRate/CurrencyLayerDriver.php b/app/Support/ExchangeRate/CurrencyLayerDriver.php
similarity index 97%
rename from app/Support/Integrations/ExchangeRate/CurrencyLayerDriver.php
rename to app/Support/ExchangeRate/CurrencyLayerDriver.php
index 4a496eb7..b63f36bf 100644
--- a/app/Support/Integrations/ExchangeRate/CurrencyLayerDriver.php
+++ b/app/Support/ExchangeRate/CurrencyLayerDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Integrations\ExchangeRate;
+namespace App\Support\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Support/Integrations/ExchangeRate/ExchangeRateDriver.php b/app/Support/ExchangeRate/ExchangeRateDriver.php
similarity index 94%
rename from app/Support/Integrations/ExchangeRate/ExchangeRateDriver.php
rename to app/Support/ExchangeRate/ExchangeRateDriver.php
index 3fb62ffe..67dacc7a 100644
--- a/app/Support/Integrations/ExchangeRate/ExchangeRateDriver.php
+++ b/app/Support/ExchangeRate/ExchangeRateDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Integrations\ExchangeRate;
+namespace App\Support\ExchangeRate;
 
 abstract class ExchangeRateDriver
 {
diff --git a/app/Support/Integrations/ExchangeRate/ExchangeRateDriverFactory.php b/app/Support/ExchangeRate/ExchangeRateDriverFactory.php
similarity index 98%
rename from app/Support/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
rename to app/Support/ExchangeRate/ExchangeRateDriverFactory.php
index 60b7daed..7400812b 100644
--- a/app/Support/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
+++ b/app/Support/ExchangeRate/ExchangeRateDriverFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Integrations\ExchangeRate;
+namespace App\Support\ExchangeRate;
 
 use InvalidArgumentException;
 use InvoiceShelf\Modules\Registry;
diff --git a/app/Support/Integrations/ExchangeRate/ExchangeRateException.php b/app/Support/ExchangeRate/ExchangeRateException.php
similarity index 82%
rename from app/Support/Integrations/ExchangeRate/ExchangeRateException.php
rename to app/Support/ExchangeRate/ExchangeRateException.php
index 5e8dfb20..ebd91a41 100644
--- a/app/Support/Integrations/ExchangeRate/ExchangeRateException.php
+++ b/app/Support/ExchangeRate/ExchangeRateException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Integrations\ExchangeRate;
+namespace App\Support\ExchangeRate;
 
 class ExchangeRateException extends \RuntimeException
 {
diff --git a/app/Support/Integrations/ExchangeRate/OpenExchangeRateDriver.php b/app/Support/ExchangeRate/OpenExchangeRateDriver.php
similarity index 97%
rename from app/Support/Integrations/ExchangeRate/OpenExchangeRateDriver.php
rename to app/Support/ExchangeRate/OpenExchangeRateDriver.php
index 728ed37d..d195603d 100644
--- a/app/Support/Integrations/ExchangeRate/OpenExchangeRateDriver.php
+++ b/app/Support/ExchangeRate/OpenExchangeRateDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Integrations\ExchangeRate;
+namespace App\Support\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Support/Formatters/DateFormatter.php b/app/Support/Formatting/DateFormatter.php
similarity index 97%
rename from app/Support/Formatters/DateFormatter.php
rename to app/Support/Formatting/DateFormatter.php
index 9e11f278..88ce0c62 100644
--- a/app/Support/Formatters/DateFormatter.php
+++ b/app/Support/Formatting/DateFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Formatters;
+namespace App\Support\Formatting;
 
 use Carbon\Carbon;
 
diff --git a/app/Support/Formatters/TimeFormatter.php b/app/Support/Formatting/TimeFormatter.php
similarity index 95%
rename from app/Support/Formatters/TimeFormatter.php
rename to app/Support/Formatting/TimeFormatter.php
index ac1430bb..7011d5c4 100644
--- a/app/Support/Formatters/TimeFormatter.php
+++ b/app/Support/Formatting/TimeFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Formatters;
+namespace App\Support\Formatting;
 
 use Carbon\Carbon;
 
diff --git a/app/Support/Formatters/TimeZones.php b/app/Support/Formatting/TimeZones.php
similarity index 99%
rename from app/Support/Formatters/TimeZones.php
rename to app/Support/Formatting/TimeZones.php
index f0d48868..8a1eac23 100644
--- a/app/Support/Formatters/TimeZones.php
+++ b/app/Support/Formatting/TimeZones.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Formatters;
+namespace App\Support\Formatting;
 
 class TimeZones
 {
diff --git a/tests/Unit/ExchangeRateDriverFactoryTest.php b/tests/Unit/ExchangeRateDriverFactoryTest.php
index 5c682b39..127481c0 100644
--- a/tests/Unit/ExchangeRateDriverFactoryTest.php
+++ b/tests/Unit/ExchangeRateDriverFactoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Support\Integrations\ExchangeRate\CurrencyFreakDriver;
-use App\Support\Integrations\ExchangeRate\ExchangeRateDriver;
-use App\Support\Integrations\ExchangeRate\ExchangeRateDriverFactory;
+use App\Support\ExchangeRate\CurrencyFreakDriver;
+use App\Support\ExchangeRate\ExchangeRateDriver;
+use App\Support\ExchangeRate\ExchangeRateDriverFactory;
 use InvoiceShelf\Modules\Registry;
 
 test('make resolves built-in drivers from the factory map', function () {