gnikyt · gnikyt · Jul 12, 2021 · Jul 10, 2021
diff --git a/composer.json b/composer.json
@@ -50,12 +50,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Osiset\\ShopifyApp\\": "src/ShopifyApp"
+            "Osiset\\ShopifyApp\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Osiset\\ShopifyApp\\Test\\": "tests"
+            "Osiset\\ShopifyApp\\Test\\": "tests/"
         }
     },
     "minimum-stability": "dev",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -17,15 +17,15 @@
 >
     <coverage>
         <include>
-            <directory suffix=".php">src/ShopifyApp/</directory>
+            <directory suffix=".php">src/</directory>
         </include>
         <exclude>
-            <directory>src/ShopifyApp/Contracts/</directory>
-            <directory>src/ShopifyApp/Exceptions/</directory>
-            <directory>src/ShopifyApp/Objects/Enums/</directory>
-            <directory>src/ShopifyApp/resources/</directory>
-            <file>src/ShopifyApp/Messaging/Events/AppLoggedIn.php</file>
-            <file>src/ShopifyApp/ShopifyAppProvider.php</file>
+            <directory>src/Contracts/</directory>
+            <directory>src/Exceptions/</directory>
+            <directory>src/Objects/Enums/</directory>
+            <directory>src/resources/</directory>
+            <file>src/Messaging/Events/AppLoggedIn.php</file>
+            <file>src/ShopifyAppProvider.php</file>
         </exclude>
         <report>
             <clover outputFile="build/logs/clover.xml"/>

diff --git a/src/ShopifyApp/Actions/ActivatePlan.php → src/Actions/ActivatePlan.php b/src/ShopifyApp/Actions/ActivatePlan.php → src/Actions/ActivatePlan.php
diff --git a/...hopifyApp/Actions/ActivateUsageCharge.php → src/Actions/ActivateUsageCharge.php b/...hopifyApp/Actions/ActivateUsageCharge.php → src/Actions/ActivateUsageCharge.php
diff --git a/src/ShopifyApp/Actions/AfterAuthorize.php → src/Actions/AfterAuthorize.php b/src/ShopifyApp/Actions/AfterAuthorize.php → src/Actions/AfterAuthorize.php
diff --git a/src/ShopifyApp/Actions/AuthenticateShop.php → src/Actions/AuthenticateShop.php b/src/ShopifyApp/Actions/AuthenticateShop.php → src/Actions/AuthenticateShop.php
diff --git a/src/ShopifyApp/Actions/CancelCharge.php → src/Actions/CancelCharge.php b/src/ShopifyApp/Actions/CancelCharge.php → src/Actions/CancelCharge.php
diff --git a/src/ShopifyApp/Actions/CancelCurrentPlan.php → src/Actions/CancelCurrentPlan.php b/src/ShopifyApp/Actions/CancelCurrentPlan.php → src/Actions/CancelCurrentPlan.php
diff --git a/src/ShopifyApp/Actions/CreateScripts.php → src/Actions/CreateScripts.php b/src/ShopifyApp/Actions/CreateScripts.php → src/Actions/CreateScripts.php
diff --git a/src/ShopifyApp/Actions/CreateWebhooks.php → src/Actions/CreateWebhooks.php b/src/ShopifyApp/Actions/CreateWebhooks.php → src/Actions/CreateWebhooks.php
diff --git a/src/ShopifyApp/Actions/DeleteWebhooks.php → src/Actions/DeleteWebhooks.php b/src/ShopifyApp/Actions/DeleteWebhooks.php → src/Actions/DeleteWebhooks.php
diff --git a/src/ShopifyApp/Actions/DispatchScripts.php → src/Actions/DispatchScripts.php b/src/ShopifyApp/Actions/DispatchScripts.php → src/Actions/DispatchScripts.php
diff --git a/src/ShopifyApp/Actions/DispatchWebhooks.php → src/Actions/DispatchWebhooks.php b/src/ShopifyApp/Actions/DispatchWebhooks.php → src/Actions/DispatchWebhooks.php
diff --git a/src/ShopifyApp/Actions/GetPlanUrl.php → src/Actions/GetPlanUrl.php b/src/ShopifyApp/Actions/GetPlanUrl.php → src/Actions/GetPlanUrl.php
diff --git a/src/ShopifyApp/Actions/InstallShop.php → src/Actions/InstallShop.php b/src/ShopifyApp/Actions/InstallShop.php → src/Actions/InstallShop.php
diff --git a/...pifyApp/Console/WebhookJobMakeCommand.php → src/Console/WebhookJobMakeCommand.php b/...pifyApp/Console/WebhookJobMakeCommand.php → src/Console/WebhookJobMakeCommand.php
diff --git a/...ShopifyApp/Console/stubs/webhook-job.stub → src/Console/stubs/webhook-job.stub b/...ShopifyApp/Console/stubs/webhook-job.stub → src/Console/stubs/webhook-job.stub
diff --git a/src/ShopifyApp/Contracts/ApiHelper.php → src/Contracts/ApiHelper.php b/src/ShopifyApp/Contracts/ApiHelper.php → src/Contracts/ApiHelper.php
diff --git a/src/ShopifyApp/Contracts/Commands/Charge.php → src/Contracts/Commands/Charge.php b/src/ShopifyApp/Contracts/Commands/Charge.php → src/Contracts/Commands/Charge.php
diff --git a/src/ShopifyApp/Contracts/Commands/Shop.php → src/Contracts/Commands/Shop.php b/src/ShopifyApp/Contracts/Commands/Shop.php → src/Contracts/Commands/Shop.php
diff --git a/.../Contracts/Objects/Values/AccessToken.php → src/Contracts/Objects/Values/AccessToken.php b/.../Contracts/Objects/Values/AccessToken.php → src/Contracts/Objects/Values/AccessToken.php
diff --git a/...fyApp/Contracts/Objects/Values/PlanId.php → src/Contracts/Objects/Values/PlanId.php b/...fyApp/Contracts/Objects/Values/PlanId.php → src/Contracts/Objects/Values/PlanId.php
diff --git a/...pp/Contracts/Objects/Values/SessionId.php → src/Contracts/Objects/Values/SessionId.php b/...pp/Contracts/Objects/Values/SessionId.php → src/Contracts/Objects/Values/SessionId.php
diff --git a/...Contracts/Objects/Values/SessionToken.php → ...Contracts/Objects/Values/SessionToken.php b/...Contracts/Objects/Values/SessionToken.php → ...Contracts/Objects/Values/SessionToken.php
diff --git a/...p/Contracts/Objects/Values/ShopDomain.php → src/Contracts/Objects/Values/ShopDomain.php b/...p/Contracts/Objects/Values/ShopDomain.php → src/Contracts/Objects/Values/ShopDomain.php
diff --git a/...fyApp/Contracts/Objects/Values/ShopId.php → src/Contracts/Objects/Values/ShopId.php b/...fyApp/Contracts/Objects/Values/ShopId.php → src/Contracts/Objects/Values/ShopId.php
diff --git a/src/ShopifyApp/Contracts/Queries/Charge.php → src/Contracts/Queries/Charge.php b/src/ShopifyApp/Contracts/Queries/Charge.php → src/Contracts/Queries/Charge.php
diff --git a/src/ShopifyApp/Contracts/Queries/Plan.php → src/Contracts/Queries/Plan.php b/src/ShopifyApp/Contracts/Queries/Plan.php → src/Contracts/Queries/Plan.php
diff --git a/src/ShopifyApp/Contracts/Queries/Shop.php → src/Contracts/Queries/Shop.php b/src/ShopifyApp/Contracts/Queries/Shop.php → src/Contracts/Queries/Shop.php
diff --git a/src/ShopifyApp/Contracts/ShopModel.php → src/Contracts/ShopModel.php b/src/ShopifyApp/Contracts/ShopModel.php → src/Contracts/ShopModel.php
diff --git a/src/ShopifyApp/Directives/SessionToken.php → src/Directives/SessionToken.php b/src/ShopifyApp/Directives/SessionToken.php → src/Directives/SessionToken.php
diff --git a/src/ShopifyApp/Exceptions/ApiException.php → src/Exceptions/ApiException.php b/src/ShopifyApp/Exceptions/ApiException.php → src/Exceptions/ApiException.php
diff --git a/src/ShopifyApp/Exceptions/BaseException.php → src/Exceptions/BaseException.php b/src/ShopifyApp/Exceptions/BaseException.php → src/Exceptions/BaseException.php
diff --git a/...xceptions/ChargeNotRecurringException.php → ...xceptions/ChargeNotRecurringException.php b/...xceptions/ChargeNotRecurringException.php → ...xceptions/ChargeNotRecurringException.php
diff --git a/.../ChargeNotRecurringOrOnetimeException.php → .../ChargeNotRecurringOrOnetimeException.php b/.../ChargeNotRecurringOrOnetimeException.php → .../ChargeNotRecurringOrOnetimeException.php
diff --git a/src/ShopifyApp/Exceptions/HttpException.php → src/Exceptions/HttpException.php b/src/ShopifyApp/Exceptions/HttpException.php → src/Exceptions/HttpException.php
diff --git a/...pp/Exceptions/MissingAuthUrlException.php → src/Exceptions/MissingAuthUrlException.php b/...pp/Exceptions/MissingAuthUrlException.php → src/Exceptions/MissingAuthUrlException.php
diff --git a/...Exceptions/MissingShopDomainException.php → ...Exceptions/MissingShopDomainException.php b/...Exceptions/MissingShopDomainException.php → ...Exceptions/MissingShopDomainException.php
diff --git a/...ptions/SignatureVerificationException.php → ...ptions/SignatureVerificationException.php b/...ptions/SignatureVerificationException.php → ...ptions/SignatureVerificationException.php
diff --git a/...ifyApp/Http/Controllers/ApiController.php → src/Http/Controllers/ApiController.php b/...ifyApp/Http/Controllers/ApiController.php → src/Http/Controllers/ApiController.php
diff --git a/...fyApp/Http/Controllers/AuthController.php → src/Http/Controllers/AuthController.php b/...fyApp/Http/Controllers/AuthController.php → src/Http/Controllers/AuthController.php
diff --git a/...pp/Http/Controllers/BillingController.php → src/Http/Controllers/BillingController.php b/...pp/Http/Controllers/BillingController.php → src/Http/Controllers/BillingController.php
diff --git a/...fyApp/Http/Controllers/HomeController.php → src/Http/Controllers/HomeController.php b/...fyApp/Http/Controllers/HomeController.php → src/Http/Controllers/HomeController.php
diff --git a/...pp/Http/Controllers/WebhookController.php → src/Http/Controllers/WebhookController.php b/...pp/Http/Controllers/WebhookController.php → src/Http/Controllers/WebhookController.php
diff --git a/src/ShopifyApp/Http/Middleware/AuthProxy.php → src/Http/Middleware/AuthProxy.php b/src/ShopifyApp/Http/Middleware/AuthProxy.php → src/Http/Middleware/AuthProxy.php
diff --git a/...hopifyApp/Http/Middleware/AuthWebhook.php → src/Http/Middleware/AuthWebhook.php b/...hopifyApp/Http/Middleware/AuthWebhook.php → src/Http/Middleware/AuthWebhook.php
diff --git a/src/ShopifyApp/Http/Middleware/Billable.php → src/Http/Middleware/Billable.php b/src/ShopifyApp/Http/Middleware/Billable.php → src/Http/Middleware/Billable.php
diff --git a/...pifyApp/Http/Middleware/VerifyShopify.php → src/Http/Middleware/VerifyShopify.php b/...pifyApp/Http/Middleware/VerifyShopify.php → src/Http/Middleware/VerifyShopify.php
diff --git a/...ifyApp/Http/Requests/StoreUsageCharge.php → src/Http/Requests/StoreUsageCharge.php b/...ifyApp/Http/Requests/StoreUsageCharge.php → src/Http/Requests/StoreUsageCharge.php
diff --git a/src/ShopifyApp/Macros/TokenRedirect.php → src/Macros/TokenRedirect.php b/src/ShopifyApp/Macros/TokenRedirect.php → src/Macros/TokenRedirect.php
diff --git a/src/ShopifyApp/Macros/TokenRoute.php → src/Macros/TokenRoute.php b/src/ShopifyApp/Macros/TokenRoute.php → src/Macros/TokenRoute.php
diff --git a/src/ShopifyApp/Macros/TokenUrl.php → src/Macros/TokenUrl.php b/src/ShopifyApp/Macros/TokenUrl.php → src/Macros/TokenUrl.php
diff --git a/...opifyApp/Messaging/Events/AppLoggedIn.php → src/Messaging/Events/AppLoggedIn.php b/...opifyApp/Messaging/Events/AppLoggedIn.php → src/Messaging/Events/AppLoggedIn.php
diff --git a/...yApp/Messaging/Jobs/AppUninstalledJob.php → src/Messaging/Jobs/AppUninstalledJob.php b/...yApp/Messaging/Jobs/AppUninstalledJob.php → src/Messaging/Jobs/AppUninstalledJob.php
diff --git a/...App/Messaging/Jobs/ScripttagInstaller.php → src/Messaging/Jobs/ScripttagInstaller.php b/...App/Messaging/Jobs/ScripttagInstaller.php → src/Messaging/Jobs/ScripttagInstaller.php
diff --git a/...fyApp/Messaging/Jobs/WebhookInstaller.php → src/Messaging/Jobs/WebhookInstaller.php b/...fyApp/Messaging/Jobs/WebhookInstaller.php → src/Messaging/Jobs/WebhookInstaller.php
diff --git a/src/ShopifyApp/Objects/Enums/ApiMethod.php → src/Objects/Enums/ApiMethod.php b/src/ShopifyApp/Objects/Enums/ApiMethod.php → src/Objects/Enums/ApiMethod.php
diff --git a/src/ShopifyApp/Objects/Enums/AuthMode.php → src/Objects/Enums/AuthMode.php b/src/ShopifyApp/Objects/Enums/AuthMode.php → src/Objects/Enums/AuthMode.php
diff --git a/...opifyApp/Objects/Enums/ChargeInterval.php → src/Objects/Enums/ChargeInterval.php b/...opifyApp/Objects/Enums/ChargeInterval.php → src/Objects/Enums/ChargeInterval.php
diff --git a/...ShopifyApp/Objects/Enums/ChargeStatus.php → src/Objects/Enums/ChargeStatus.php b/...ShopifyApp/Objects/Enums/ChargeStatus.php → src/Objects/Enums/ChargeStatus.php
diff --git a/src/ShopifyApp/Objects/Enums/ChargeType.php → src/Objects/Enums/ChargeType.php b/src/ShopifyApp/Objects/Enums/ChargeType.php → src/Objects/Enums/ChargeType.php
diff --git a/src/ShopifyApp/Objects/Enums/DataSource.php → src/Objects/Enums/DataSource.php b/src/ShopifyApp/Objects/Enums/DataSource.php → src/Objects/Enums/DataSource.php
diff --git a/...ShopifyApp/Objects/Enums/PlanInterval.php → src/Objects/Enums/PlanInterval.php b/...ShopifyApp/Objects/Enums/PlanInterval.php → src/Objects/Enums/PlanInterval.php
diff --git a/src/ShopifyApp/Objects/Enums/PlanType.php → src/Objects/Enums/PlanType.php b/src/ShopifyApp/Objects/Enums/PlanType.php → src/Objects/Enums/PlanType.php
diff --git a/...pp/Objects/Transfers/AbstractTransfer.php → src/Objects/Transfers/AbstractTransfer.php b/...pp/Objects/Transfers/AbstractTransfer.php → src/Objects/Transfers/AbstractTransfer.php
diff --git a/src/ShopifyApp/Objects/Transfers/Charge.php → src/Objects/Transfers/Charge.php b/src/ShopifyApp/Objects/Transfers/Charge.php → src/Objects/Transfers/Charge.php
diff --git a/...pifyApp/Objects/Transfers/PlanDetails.php → src/Objects/Transfers/PlanDetails.php b/...pifyApp/Objects/Transfers/PlanDetails.php → src/Objects/Transfers/PlanDetails.php
diff --git a/...pifyApp/Objects/Transfers/UsageCharge.php → src/Objects/Transfers/UsageCharge.php b/...pifyApp/Objects/Transfers/UsageCharge.php → src/Objects/Transfers/UsageCharge.php
diff --git a/.../Objects/Transfers/UsageChargeDetails.php → src/Objects/Transfers/UsageChargeDetails.php b/.../Objects/Transfers/UsageChargeDetails.php → src/Objects/Transfers/UsageChargeDetails.php
diff --git a/...ShopifyApp/Objects/Values/AccessToken.php → src/Objects/Values/AccessToken.php b/...ShopifyApp/Objects/Values/AccessToken.php → src/Objects/Values/AccessToken.php
diff --git a/src/ShopifyApp/Objects/Values/ChargeId.php → src/Objects/Values/ChargeId.php b/src/ShopifyApp/Objects/Values/ChargeId.php → src/Objects/Values/ChargeId.php
diff --git a/...ifyApp/Objects/Values/ChargeReference.php → src/Objects/Values/ChargeReference.php b/...ifyApp/Objects/Values/ChargeReference.php → src/Objects/Values/ChargeReference.php
diff --git a/src/ShopifyApp/Objects/Values/Hmac.php → src/Objects/Values/Hmac.php b/src/ShopifyApp/Objects/Values/Hmac.php → src/Objects/Values/Hmac.php
diff --git a/...ifyApp/Objects/Values/NullAccessToken.php → src/Objects/Values/NullAccessToken.php b/...ifyApp/Objects/Values/NullAccessToken.php → src/Objects/Values/NullAccessToken.php
diff --git a/src/ShopifyApp/Objects/Values/NullPlanId.php → src/Objects/Values/NullPlanId.php b/src/ShopifyApp/Objects/Values/NullPlanId.php → src/Objects/Values/NullPlanId.php
diff --git a/...opifyApp/Objects/Values/NullSessionId.php → src/Objects/Values/NullSessionId.php b/...opifyApp/Objects/Values/NullSessionId.php → src/Objects/Values/NullSessionId.php
diff --git a/...fyApp/Objects/Values/NullSessionToken.php → src/Objects/Values/NullSessionToken.php b/...fyApp/Objects/Values/NullSessionToken.php → src/Objects/Values/NullSessionToken.php
diff --git a/...pifyApp/Objects/Values/NullShopDomain.php → src/Objects/Values/NullShopDomain.php b/...pifyApp/Objects/Values/NullShopDomain.php → src/Objects/Values/NullShopDomain.php
diff --git a/...pp/Objects/Values/NullableAccessToken.php → src/Objects/Values/NullableAccessToken.php b/...pp/Objects/Values/NullableAccessToken.php → src/Objects/Values/NullableAccessToken.php
diff --git a/...pifyApp/Objects/Values/NullablePlanId.php → src/Objects/Values/NullablePlanId.php b/...pifyApp/Objects/Values/NullablePlanId.php → src/Objects/Values/NullablePlanId.php
diff --git a/...yApp/Objects/Values/NullableSessionId.php → src/Objects/Values/NullableSessionId.php b/...yApp/Objects/Values/NullableSessionId.php → src/Objects/Values/NullableSessionId.php
diff --git a/...p/Objects/Values/NullableSessionToken.php → src/Objects/Values/NullableSessionToken.php b/...p/Objects/Values/NullableSessionToken.php → src/Objects/Values/NullableSessionToken.php
diff --git a/...App/Objects/Values/NullableShopDomain.php → src/Objects/Values/NullableShopDomain.php b/...App/Objects/Values/NullableShopDomain.php → src/Objects/Values/NullableShopDomain.php
diff --git a/src/ShopifyApp/Objects/Values/PlanId.php → src/Objects/Values/PlanId.php b/src/ShopifyApp/Objects/Values/PlanId.php → src/Objects/Values/PlanId.php
diff --git a/...pifyApp/Objects/Values/SessionContext.php → src/Objects/Values/SessionContext.php b/...pifyApp/Objects/Values/SessionContext.php → src/Objects/Values/SessionContext.php
diff --git a/src/ShopifyApp/Objects/Values/SessionId.php → src/Objects/Values/SessionId.php b/src/ShopifyApp/Objects/Values/SessionId.php → src/Objects/Values/SessionId.php
diff --git a/...hopifyApp/Objects/Values/SessionToken.php → src/Objects/Values/SessionToken.php b/...hopifyApp/Objects/Values/SessionToken.php → src/Objects/Values/SessionToken.php
diff --git a/src/ShopifyApp/Objects/Values/ShopDomain.php → src/Objects/Values/ShopDomain.php b/src/ShopifyApp/Objects/Values/ShopDomain.php → src/Objects/Values/ShopDomain.php
diff --git a/src/ShopifyApp/Objects/Values/ShopId.php → src/Objects/Values/ShopId.php b/src/ShopifyApp/Objects/Values/ShopId.php → src/Objects/Values/ShopId.php
diff --git a/src/ShopifyApp/Services/ApiHelper.php → src/Services/ApiHelper.php b/src/ShopifyApp/Services/ApiHelper.php → src/Services/ApiHelper.php
diff --git a/src/ShopifyApp/Services/ChargeHelper.php → src/Services/ChargeHelper.php b/src/ShopifyApp/Services/ChargeHelper.php → src/Services/ChargeHelper.php
diff --git a/src/ShopifyApp/Services/CookieHelper.php → src/Services/CookieHelper.php b/src/ShopifyApp/Services/CookieHelper.php → src/Services/CookieHelper.php
diff --git a/src/ShopifyApp/ShopifyAppProvider.php → src/ShopifyAppProvider.php b/src/ShopifyApp/ShopifyAppProvider.php → src/ShopifyAppProvider.php
diff --git a/src/ShopifyApp/Storage/Commands/Charge.php → src/Storage/Commands/Charge.php b/src/ShopifyApp/Storage/Commands/Charge.php → src/Storage/Commands/Charge.php
diff --git a/src/ShopifyApp/Storage/Commands/Shop.php → src/Storage/Commands/Shop.php b/src/ShopifyApp/Storage/Commands/Shop.php → src/Storage/Commands/Shop.php
diff --git a/src/ShopifyApp/Storage/Models/Charge.php → src/Storage/Models/Charge.php b/src/ShopifyApp/Storage/Models/Charge.php → src/Storage/Models/Charge.php
diff --git a/src/ShopifyApp/Storage/Models/Plan.php → src/Storage/Models/Plan.php b/src/ShopifyApp/Storage/Models/Plan.php → src/Storage/Models/Plan.php
diff --git a/src/ShopifyApp/Storage/Observers/Shop.php → src/Storage/Observers/Shop.php b/src/ShopifyApp/Storage/Observers/Shop.php → src/Storage/Observers/Shop.php
diff --git a/src/ShopifyApp/Storage/Queries/Charge.php → src/Storage/Queries/Charge.php b/src/ShopifyApp/Storage/Queries/Charge.php → src/Storage/Queries/Charge.php
diff --git a/src/ShopifyApp/Storage/Queries/Plan.php → src/Storage/Queries/Plan.php b/src/ShopifyApp/Storage/Queries/Plan.php → src/Storage/Queries/Plan.php
diff --git a/src/ShopifyApp/Storage/Queries/Shop.php → src/Storage/Queries/Shop.php b/src/ShopifyApp/Storage/Queries/Shop.php → src/Storage/Queries/Shop.php
diff --git a/...ShopifyApp/Storage/Scopes/Namespacing.php → src/Storage/Scopes/Namespacing.php b/...ShopifyApp/Storage/Scopes/Namespacing.php → src/Storage/Scopes/Namespacing.php
diff --git a/src/ShopifyApp/Traits/ApiController.php → src/Traits/ApiController.php b/src/ShopifyApp/Traits/ApiController.php → src/Traits/ApiController.php
diff --git a/src/ShopifyApp/Traits/AuthController.php → src/Traits/AuthController.php b/src/ShopifyApp/Traits/AuthController.php → src/Traits/AuthController.php
diff --git a/src/ShopifyApp/Traits/BillingController.php → src/Traits/BillingController.php b/src/ShopifyApp/Traits/BillingController.php → src/Traits/BillingController.php
diff --git a/src/ShopifyApp/Traits/HomeController.php → src/Traits/HomeController.php b/src/ShopifyApp/Traits/HomeController.php → src/Traits/HomeController.php
diff --git a/src/ShopifyApp/Traits/ShopAccessible.php → src/Traits/ShopAccessible.php b/src/ShopifyApp/Traits/ShopAccessible.php → src/Traits/ShopAccessible.php
diff --git a/src/ShopifyApp/Traits/ShopModel.php → src/Traits/ShopModel.php b/src/ShopifyApp/Traits/ShopModel.php → src/Traits/ShopModel.php
diff --git a/src/ShopifyApp/Traits/WebhookController.php → src/Traits/WebhookController.php b/src/ShopifyApp/Traits/WebhookController.php → src/Traits/WebhookController.php
diff --git a/src/ShopifyApp/Util.php → src/Util.php b/src/ShopifyApp/Util.php → src/Util.php
diff --git a/...opifyApp/resources/config/shopify-app.php → src/resources/config/shopify-app.php b/...opifyApp/resources/config/shopify-app.php → src/resources/config/shopify-app.php
diff --git a/...rces/database/factories/ChargeFactory.php → ...rces/database/factories/ChargeFactory.php b/...rces/database/factories/ChargeFactory.php → ...rces/database/factories/ChargeFactory.php
diff --git a/...ources/database/factories/PlanFactory.php → ...ources/database/factories/PlanFactory.php b/...ources/database/factories/PlanFactory.php → ...ources/database/factories/PlanFactory.php
diff --git a/...ources/database/factories/ShopFactory.php → ...ources/database/factories/ShopFactory.php b/...ources/database/factories/ShopFactory.php → ...ources/database/factories/ShopFactory.php
diff --git a/.../2020_01_29_010501_create_plans_table.php → .../2020_01_29_010501_create_plans_table.php b/.../2020_01_29_010501_create_plans_table.php → .../2020_01_29_010501_create_plans_table.php
diff --git a/.../2020_01_29_230905_create_shops_table.php → .../2020_01_29_230905_create_shops_table.php b/.../2020_01_29_230905_create_shops_table.php → .../2020_01_29_230905_create_shops_table.php
diff --git a/...020_01_29_231006_create_charges_table.php → ...020_01_29_231006_create_charges_table.php b/...020_01_29_231006_create_charges_table.php → ...020_01_29_231006_create_charges_table.php
diff --git a/..._add_interval_column_to_charges_table.php → ..._add_interval_column_to_charges_table.php b/..._add_interval_column_to_charges_table.php → ..._add_interval_column_to_charges_table.php
diff --git a/...54_add_interval_column_to_plans_table.php → ...54_add_interval_column_to_plans_table.php b/...54_add_interval_column_to_plans_table.php → ...54_add_interval_column_to_plans_table.php
diff --git a/...dd_password_updated_at_to_users_table.php → ...dd_password_updated_at_to_users_table.php b/...dd_password_updated_at_to_users_table.php → ...dd_password_updated_at_to_users_table.php
diff --git a/...yApp/resources/jobs/AppUninstalledJob.php → src/resources/jobs/AppUninstalledJob.php b/...yApp/resources/jobs/AppUninstalledJob.php → src/resources/jobs/AppUninstalledJob.php
diff --git a/src/ShopifyApp/resources/routes/api.php → src/resources/routes/api.php b/src/ShopifyApp/resources/routes/api.php → src/resources/routes/api.php
diff --git a/src/ShopifyApp/resources/routes/shopify.php → src/resources/routes/shopify.php b/src/ShopifyApp/resources/routes/shopify.php → src/resources/routes/shopify.php
diff --git a/...es/views/auth/fullpage_redirect.blade.php → ...es/views/auth/fullpage_redirect.blade.php b/...es/views/auth/fullpage_redirect.blade.php → ...es/views/auth/fullpage_redirect.blade.php
diff --git a/...yApp/resources/views/auth/token.blade.php → src/resources/views/auth/token.blade.php b/...yApp/resources/views/auth/token.blade.php → src/resources/views/auth/token.blade.php
diff --git a/...p/resources/views/billing/error.blade.php → src/resources/views/billing/error.blade.php b/...p/resources/views/billing/error.blade.php → src/resources/views/billing/error.blade.php
diff --git a/...views/billing/fullpage_redirect.blade.php → ...views/billing/fullpage_redirect.blade.php b/...views/billing/fullpage_redirect.blade.php → ...views/billing/fullpage_redirect.blade.php
diff --git a/...yApp/resources/views/home/index.blade.php → src/resources/views/home/index.blade.php b/...yApp/resources/views/home/index.blade.php → src/resources/views/home/index.blade.php
diff --git a/...resources/views/layouts/default.blade.php → ...resources/views/layouts/default.blade.php b/...resources/views/layouts/default.blade.php → ...resources/views/layouts/default.blade.php
diff --git a/...p/resources/views/layouts/error.blade.php → src/resources/views/layouts/error.blade.php b/...p/resources/views/layouts/error.blade.php → src/resources/views/layouts/error.blade.php
diff --git a/...s/views/partials/flash_messages.blade.php → ...s/views/partials/flash_messages.blade.php b/...s/views/partials/flash_messages.blade.php → ...s/views/partials/flash_messages.blade.php
diff --git a/...s/partials/laravel_skeleton_css.blade.php → ...s/partials/laravel_skeleton_css.blade.php b/...s/partials/laravel_skeleton_css.blade.php → ...s/partials/laravel_skeleton_css.blade.php
diff --git a/...s/partials/polaris_skeleton_css.blade.php → ...s/partials/polaris_skeleton_css.blade.php b/...s/partials/polaris_skeleton_css.blade.php → ...s/partials/polaris_skeleton_css.blade.php
diff --git a/...es/views/partials/token_handler.blade.php → ...es/views/partials/token_handler.blade.php b/...es/views/partials/token_handler.blade.php → ...es/views/partials/token_handler.blade.php
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -50,7 +50,7 @@ public function setUp(): void
 
         // Setup database
         $this->setupDatabase($this->app);
-        $this->withFactories(__DIR__.'/../src/ShopifyApp/resources/database/factories');
+        $this->withFactories(__DIR__.'/../src/resources/database/factories');
 
         // Assign the user model
         $this->model = $this->app['config']->get('auth.providers.users.model');