diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
index c1fb68b..9d24a26 100644
--- a/.github/workflows/on-pull-request.yml
+++ b/.github/workflows/on-pull-request.yml
@@ -22,7 +22,7 @@ jobs:
           php-version: '8.1'
           tools: phpcs, cs2pr
       - name: Lint
-        run: phpcs -q --standard=PSR12 --report=checkstyle src | cs2pr
+        run: phpcs -q --standard=PSR12 --report=checkstyle --ignore=src/generated/* src | cs2pr
   format:
     name: Format
     runs-on: ubuntu-latest
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 0115076..9c52e44 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -3,7 +3,7 @@
 $finder = (new PhpCsFixer\Finder())
     ->in(__DIR__)
     ->exclude([
-        'generated',
+        'src/generated',
     ])
 ;
 
diff --git a/composer.json b/composer.json
index 637dea5..7cfd858 100644
--- a/composer.json
+++ b/composer.json
@@ -28,8 +28,8 @@
         }
     ],
     "scripts": {
-        "lint": "./vendor/bin/phpcs --standard=PSR12 --report=full src",
-        "phpcs-fix": "./vendor/bin/phpcbf --standard=PSR12 src",
+        "lint": "./vendor/bin/phpcs --standard=PSR12 --report=full --ignore=src/generated/* src",
+        "phpcs-fix": "./vendor/bin/phpcbf --standard=PSR12 --ignore=src/generated/* src",
         "format": "./vendor/bin/php-cs-fixer fix --allow-risky=yes --rules=@PSR12"
     },
     "require": {
@@ -51,7 +51,7 @@
     "autoload": {
         "psr-4": {
             "OpenAPI\\Client\\": [
-                "generated/lib/"
+                "src/generated/"
             ],
             "Passage\\Client\\": "src/"
         }
diff --git a/generate.sh b/generate.sh
index 9054074..192af0e 100755
--- a/generate.sh
+++ b/generate.sh
@@ -8,7 +8,7 @@ fi
 
 file="$1"
 
-rm -rf ./generated
+rm -rf ./src/generated/*
 
 docker run --rm -v "${PWD}:/local" -u $(id -u) openapitools/openapi-generator-cli:latest generate \
   -i "/local/$file" \
@@ -16,14 +16,13 @@ docker run --rm -v "${PWD}:/local" -u $(id -u) openapitools/openapi-generator-cl
   -o /local/temp \
   --global-property apiTests=false,modelTests=false,apiDocs=false,modelDocs=false
 
-mkdir -p ./generated/lib
-mv ./temp/src/* ./generated/lib
+mv ./temp/src/* ./src/generated
 rm -rf ./temp
 
 add_passage_version_header() {
   local header_comment="// Add Passage version header"
 
-  if grep -q "$header_comment" generated/lib/HeaderSelector.php; then
+  if grep -q "$header_comment" src/generated/HeaderSelector.php; then
     echo "Passage version header already exists"
     return 0
   fi
@@ -42,18 +41,18 @@ add_passage_version_header() {
 \\
         \$headers['Passage-Version'] = '$package_name ' . \$packageVersion;\\
 " \
-  generated/lib/HeaderSelector.php
+  src/generated/HeaderSelector.php
 }
 
 # php-nextgen is generating error model return values from the API instead of void for some operations
 # so this changes the return value back to void
 return_void() {
   local bad_user_return_type=' \\OpenAPI\\Client\\Model\\Model401Error|\\OpenAPI\\Client\\Model\\Model404Error|\\OpenAPI\\Client\\Model\\Model500Error'
-  sed -i 's/'"$bad_user_return_type"'/ void/' generated/lib/Api/UsersApi.php
-  sed -i 's/'"$bad_user_return_type"'/ void/' generated/lib/Api/UserDevicesApi.php
+  sed -i 's/'"$bad_user_return_type"'/ void/' src/generated/Api/UsersApi.php
+  sed -i 's/'"$bad_user_return_type"'/ void/' src/generated/Api/UserDevicesApi.php
 
   local bad_token_return_type=' \\OpenAPI\\Client\\Model\\Model401Error|\\OpenAPI\\Client\\Model\\Model403Error|\\OpenAPI\\Client\\Model\\Model404Error|\\OpenAPI\\Client\\Model\\Model500Error'
-  sed -i 's/'"$bad_token_return_type"'/ void/' generated/lib/Api/TokensApi.php
+  sed -i 's/'"$bad_token_return_type"'/ void/' src/generated/Api/TokensApi.php
 }
 
 add_passage_version_header
diff --git a/generated/lib/Api/MagicLinksApi.php b/src/generated/Api/MagicLinksApi.php
similarity index 100%
rename from generated/lib/Api/MagicLinksApi.php
rename to src/generated/Api/MagicLinksApi.php
diff --git a/generated/lib/Api/TokensApi.php b/src/generated/Api/TokensApi.php
similarity index 100%
rename from generated/lib/Api/TokensApi.php
rename to src/generated/Api/TokensApi.php
diff --git a/generated/lib/Api/UserDevicesApi.php b/src/generated/Api/UserDevicesApi.php
similarity index 100%
rename from generated/lib/Api/UserDevicesApi.php
rename to src/generated/Api/UserDevicesApi.php
diff --git a/generated/lib/Api/UsersApi.php b/src/generated/Api/UsersApi.php
similarity index 100%
rename from generated/lib/Api/UsersApi.php
rename to src/generated/Api/UsersApi.php
diff --git a/generated/lib/ApiException.php b/src/generated/ApiException.php
similarity index 100%
rename from generated/lib/ApiException.php
rename to src/generated/ApiException.php
diff --git a/generated/lib/Configuration.php b/src/generated/Configuration.php
similarity index 100%
rename from generated/lib/Configuration.php
rename to src/generated/Configuration.php
diff --git a/generated/lib/HeaderSelector.php b/src/generated/HeaderSelector.php
similarity index 100%
rename from generated/lib/HeaderSelector.php
rename to src/generated/HeaderSelector.php
diff --git a/generated/lib/Model/AppleUserSocialConnection.php b/src/generated/Model/AppleUserSocialConnection.php
similarity index 100%
rename from generated/lib/Model/AppleUserSocialConnection.php
rename to src/generated/Model/AppleUserSocialConnection.php
diff --git a/generated/lib/Model/CreateMagicLinkRequest.php b/src/generated/Model/CreateMagicLinkRequest.php
similarity index 100%
rename from generated/lib/Model/CreateMagicLinkRequest.php
rename to src/generated/Model/CreateMagicLinkRequest.php
diff --git a/generated/lib/Model/CreateUserRequest.php b/src/generated/Model/CreateUserRequest.php
similarity index 100%
rename from generated/lib/Model/CreateUserRequest.php
rename to src/generated/Model/CreateUserRequest.php
diff --git a/generated/lib/Model/GithubUserSocialConnection.php b/src/generated/Model/GithubUserSocialConnection.php
similarity index 100%
rename from generated/lib/Model/GithubUserSocialConnection.php
rename to src/generated/Model/GithubUserSocialConnection.php
diff --git a/generated/lib/Model/GoogleUserSocialConnection.php b/src/generated/Model/GoogleUserSocialConnection.php
similarity index 100%
rename from generated/lib/Model/GoogleUserSocialConnection.php
rename to src/generated/Model/GoogleUserSocialConnection.php
diff --git a/generated/lib/Model/Link.php b/src/generated/Model/Link.php
similarity index 100%
rename from generated/lib/Model/Link.php
rename to src/generated/Model/Link.php
diff --git a/generated/lib/Model/ListDevicesResponse.php b/src/generated/Model/ListDevicesResponse.php
similarity index 100%
rename from generated/lib/Model/ListDevicesResponse.php
rename to src/generated/Model/ListDevicesResponse.php
diff --git a/generated/lib/Model/ListPaginatedUsersItem.php b/src/generated/Model/ListPaginatedUsersItem.php
similarity index 100%
rename from generated/lib/Model/ListPaginatedUsersItem.php
rename to src/generated/Model/ListPaginatedUsersItem.php
diff --git a/generated/lib/Model/ListPaginatedUsersResponse.php b/src/generated/Model/ListPaginatedUsersResponse.php
similarity index 100%
rename from generated/lib/Model/ListPaginatedUsersResponse.php
rename to src/generated/Model/ListPaginatedUsersResponse.php
diff --git a/generated/lib/Model/MagicLink.php b/src/generated/Model/MagicLink.php
similarity index 100%
rename from generated/lib/Model/MagicLink.php
rename to src/generated/Model/MagicLink.php
diff --git a/generated/lib/Model/MagicLinkChannel.php b/src/generated/Model/MagicLinkChannel.php
similarity index 100%
rename from generated/lib/Model/MagicLinkChannel.php
rename to src/generated/Model/MagicLinkChannel.php
diff --git a/generated/lib/Model/MagicLinkResponse.php b/src/generated/Model/MagicLinkResponse.php
similarity index 100%
rename from generated/lib/Model/MagicLinkResponse.php
rename to src/generated/Model/MagicLinkResponse.php
diff --git a/generated/lib/Model/MagicLinkType.php b/src/generated/Model/MagicLinkType.php
similarity index 100%
rename from generated/lib/Model/MagicLinkType.php
rename to src/generated/Model/MagicLinkType.php
diff --git a/generated/lib/Model/Model400Error.php b/src/generated/Model/Model400Error.php
similarity index 100%
rename from generated/lib/Model/Model400Error.php
rename to src/generated/Model/Model400Error.php
diff --git a/generated/lib/Model/Model401Error.php b/src/generated/Model/Model401Error.php
similarity index 100%
rename from generated/lib/Model/Model401Error.php
rename to src/generated/Model/Model401Error.php
diff --git a/generated/lib/Model/Model403Error.php b/src/generated/Model/Model403Error.php
similarity index 100%
rename from generated/lib/Model/Model403Error.php
rename to src/generated/Model/Model403Error.php
diff --git a/generated/lib/Model/Model404Error.php b/src/generated/Model/Model404Error.php
similarity index 100%
rename from generated/lib/Model/Model404Error.php
rename to src/generated/Model/Model404Error.php
diff --git a/generated/lib/Model/Model500Error.php b/src/generated/Model/Model500Error.php
similarity index 100%
rename from generated/lib/Model/Model500Error.php
rename to src/generated/Model/Model500Error.php
diff --git a/generated/lib/Model/ModelInterface.php b/src/generated/Model/ModelInterface.php
similarity index 100%
rename from generated/lib/Model/ModelInterface.php
rename to src/generated/Model/ModelInterface.php
diff --git a/generated/lib/Model/Nonce.php b/src/generated/Model/Nonce.php
similarity index 100%
rename from generated/lib/Model/Nonce.php
rename to src/generated/Model/Nonce.php
diff --git a/generated/lib/Model/PaginatedLinks.php b/src/generated/Model/PaginatedLinks.php
similarity index 100%
rename from generated/lib/Model/PaginatedLinks.php
rename to src/generated/Model/PaginatedLinks.php
diff --git a/generated/lib/Model/SocialConnectionType.php b/src/generated/Model/SocialConnectionType.php
similarity index 100%
rename from generated/lib/Model/SocialConnectionType.php
rename to src/generated/Model/SocialConnectionType.php
diff --git a/generated/lib/Model/UpdateUserRequest.php b/src/generated/Model/UpdateUserRequest.php
similarity index 100%
rename from generated/lib/Model/UpdateUserRequest.php
rename to src/generated/Model/UpdateUserRequest.php
diff --git a/generated/lib/Model/UserEventAction.php b/src/generated/Model/UserEventAction.php
similarity index 100%
rename from generated/lib/Model/UserEventAction.php
rename to src/generated/Model/UserEventAction.php
diff --git a/generated/lib/Model/UserEventStatus.php b/src/generated/Model/UserEventStatus.php
similarity index 100%
rename from generated/lib/Model/UserEventStatus.php
rename to src/generated/Model/UserEventStatus.php
diff --git a/generated/lib/Model/UserInfo.php b/src/generated/Model/UserInfo.php
similarity index 100%
rename from generated/lib/Model/UserInfo.php
rename to src/generated/Model/UserInfo.php
diff --git a/generated/lib/Model/UserRecentEvent.php b/src/generated/Model/UserRecentEvent.php
similarity index 100%
rename from generated/lib/Model/UserRecentEvent.php
rename to src/generated/Model/UserRecentEvent.php
diff --git a/generated/lib/Model/UserResponse.php b/src/generated/Model/UserResponse.php
similarity index 100%
rename from generated/lib/Model/UserResponse.php
rename to src/generated/Model/UserResponse.php
diff --git a/generated/lib/Model/UserSocialConnections.php b/src/generated/Model/UserSocialConnections.php
similarity index 100%
rename from generated/lib/Model/UserSocialConnections.php
rename to src/generated/Model/UserSocialConnections.php
diff --git a/generated/lib/Model/UserStatus.php b/src/generated/Model/UserStatus.php
similarity index 100%
rename from generated/lib/Model/UserStatus.php
rename to src/generated/Model/UserStatus.php
diff --git a/generated/lib/Model/WebAuthnDevices.php b/src/generated/Model/WebAuthnDevices.php
similarity index 100%
rename from generated/lib/Model/WebAuthnDevices.php
rename to src/generated/Model/WebAuthnDevices.php
diff --git a/generated/lib/Model/WebAuthnIcons.php b/src/generated/Model/WebAuthnIcons.php
similarity index 100%
rename from generated/lib/Model/WebAuthnIcons.php
rename to src/generated/Model/WebAuthnIcons.php
diff --git a/generated/lib/Model/WebAuthnType.php b/src/generated/Model/WebAuthnType.php
similarity index 100%
rename from generated/lib/Model/WebAuthnType.php
rename to src/generated/Model/WebAuthnType.php
diff --git a/generated/lib/ObjectSerializer.php b/src/generated/ObjectSerializer.php
similarity index 100%
rename from generated/lib/ObjectSerializer.php
rename to src/generated/ObjectSerializer.php