diff --git a/.gitignore b/.gitignore
index 7d9738fa..1caa2695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,5 @@ yarn-error.log*
 sdk/nodejs/sdk/dist
 
 # py module artifacts
-*.egg-info/
\ No newline at end of file
+*.egg-info/
+__pycache__/
\ No newline at end of file
diff --git a/bin/generate_rest.sh b/bin/generate_rest.sh
index 10e07755..97a87070 100755
--- a/bin/generate_rest.sh
+++ b/bin/generate_rest.sh
@@ -59,14 +59,15 @@ openapi-generator-cli generate -i specs/zrok.yml -o sdk/nodejs/sdk/src/api -g ty
 echo "...generating python sdk client"
 # Delete tracked Python files
 while IFS= read -r file; do
-  if [ -f "sdk/python/sdk/zrok/$file" ]; then
-    echo "Removing existing file: sdk/python/sdk/zrok/$file"
-    rm -f "sdk/python/sdk/zrok/$file"
+  if [ -f "sdk/python/src/$file" ]; then
+    echo "Removing existing file: sdk/python/src/$file"
+    rm -f "sdk/python/src/$file"
   fi
-done < sdk/python/sdk/zrok/.openapi-generator/FILES
+done < sdk/python/src/.openapi-generator/FILES
 # Delete the tracking file
-rm -f sdk/python/sdk/zrok/.openapi-generator/FILES
+rm -f sdk/python/src/.openapi-generator/FILES
 # Generate and track new files
-openapi-generator-cli generate -i specs/zrok.yml -o sdk/python/sdk/zrok --package-name zrok_api --additional-properties projectName=zrok -g python
+openapi-generator-cli generate -i specs/zrok.yml -o sdk/python/src/zrok -g python \
+  --package-name zrok_api --additional-properties projectName=zrok
 
 git checkout rest_server_zrok/configure_zrok.go
diff --git a/sdk/python/sdk/zrok/.swagger-codegen/VERSION b/sdk/python/sdk/zrok/.swagger-codegen/VERSION
deleted file mode 100644
index b262b4de..00000000
--- a/sdk/python/sdk/zrok/.swagger-codegen/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.0.51
\ No newline at end of file
diff --git a/sdk/python/sdk/zrok/.gitattributes b/sdk/python/src/.gitattributes
similarity index 100%
rename from sdk/python/sdk/zrok/.gitattributes
rename to sdk/python/src/.gitattributes
diff --git a/sdk/python/sdk/zrok/.openapi-generator-ignore b/sdk/python/src/.openapi-generator-ignore
similarity index 100%
rename from sdk/python/sdk/zrok/.openapi-generator-ignore
rename to sdk/python/src/.openapi-generator-ignore
diff --git a/sdk/python/sdk/zrok/.openapi-generator/FILES b/sdk/python/src/.openapi-generator/FILES
similarity index 100%
rename from sdk/python/sdk/zrok/.openapi-generator/FILES
rename to sdk/python/src/.openapi-generator/FILES
diff --git a/sdk/python/sdk/zrok/.openapi-generator/VERSION b/sdk/python/src/.openapi-generator/VERSION
similarity index 100%
rename from sdk/python/sdk/zrok/.openapi-generator/VERSION
rename to sdk/python/src/.openapi-generator/VERSION
diff --git a/sdk/python/sdk/zrok/__init__.py b/sdk/python/src/__init__.py
similarity index 100%
rename from sdk/python/sdk/zrok/__init__.py
rename to sdk/python/src/__init__.py
diff --git a/sdk/python/sdk/zrok/setup.cfg b/sdk/python/src/setup.cfg
similarity index 66%
rename from sdk/python/sdk/zrok/setup.cfg
rename to sdk/python/src/setup.cfg
index 0ac10e83..a23d00c4 100644
--- a/sdk/python/sdk/zrok/setup.cfg
+++ b/sdk/python/src/setup.cfg
@@ -1,8 +1,8 @@
 [metadata]
-name = openziti
-author = OpenZiti Developers
+name = zrok
+author = NetFoundry
 author_email = developers@openziti.org
-description = Ziti Python SDK
+description = zrok Python SDK
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/openziti/zrok
@@ -13,11 +13,13 @@ project_urls =
     Discussion = https://openziti.discourse.group/
 
 [options]
-package_dir =       # this is a dict definition meaning there's no special mapping, and
-    ""  = .         # continues on this line to specify finding  packages in the current directory
-packages = find:    # include all packages found
+# Find packages in the current directory with no special mapping
+package_dir =
+    = .
+packages = find:
 
 [options.packages.find]
+# exclude none
 where = .
 
 [flake8]
diff --git a/sdk/python/sdk/zrok/setup.py b/sdk/python/src/setup.py
similarity index 88%
rename from sdk/python/sdk/zrok/setup.py
rename to sdk/python/src/setup.py
index b0804965..10542ecc 100644
--- a/sdk/python/sdk/zrok/setup.py
+++ b/sdk/python/src/setup.py
@@ -7,13 +7,14 @@ import re
 NAME = os.getenv('ZROK_PY_NAME', "zrok")
 VERSION = "1.0.0"
 
-# Define your package overrides here - these take precedence over the generated requirements.txt
 OVERRIDES = {
     # Override specific packages with version constraints different from the generated requirements.txt
     "openziti": "openziti >= 1.0.0",
-    "urllib3": "urllib3 >= 2.1.0",  # urllib3 2.1.0 introduced breaking changes that are implemented by openapi-generator 7.12.0
+    # urllib3 2.1.0 introduced breaking changes that are implemented by openapi-generator 7.12.0
+    "urllib3": "urllib3 >= 2.1.0",
 }
 
+
 # Parse the generated requirements.txt
 def parse_requirements(filename):
     requirements = []
@@ -37,6 +38,7 @@ def parse_requirements(filename):
 
     return requirements
 
+
 # Combine requirements from requirements.txt and overrides
 requirements_file = Path(__file__).parent / "requirements.txt"
 REQUIRES = parse_requirements(requirements_file) + list(OVERRIDES.values())
diff --git a/sdk/python/sdk/zrok/versioneer.py b/sdk/python/src/versioneer.py
similarity index 100%
rename from sdk/python/sdk/zrok/versioneer.py
rename to sdk/python/src/versioneer.py
diff --git a/sdk/python/sdk/zrok/zrok/__init__.py b/sdk/python/src/zrok/__init__.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/__init__.py
rename to sdk/python/src/zrok/__init__.py
diff --git a/sdk/python/sdk/zrok/zrok/_version.py b/sdk/python/src/zrok/_version.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/_version.py
rename to sdk/python/src/zrok/_version.py
diff --git a/sdk/python/sdk/zrok/zrok/access.py b/sdk/python/src/zrok/access.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/access.py
rename to sdk/python/src/zrok/access.py
diff --git a/sdk/python/sdk/zrok/zrok/decor.py b/sdk/python/src/zrok/decor.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/decor.py
rename to sdk/python/src/zrok/decor.py
diff --git a/sdk/python/sdk/zrok/zrok/dialer.py b/sdk/python/src/zrok/dialer.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/dialer.py
rename to sdk/python/src/zrok/dialer.py
diff --git a/sdk/python/sdk/zrok/zrok/environment/__init__.py b/sdk/python/src/zrok/environment/__init__.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/environment/__init__.py
rename to sdk/python/src/zrok/environment/__init__.py
diff --git a/sdk/python/sdk/zrok/zrok/environment/dirs.py b/sdk/python/src/zrok/environment/dirs.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/environment/dirs.py
rename to sdk/python/src/zrok/environment/dirs.py
diff --git a/sdk/python/sdk/zrok/zrok/environment/root.py b/sdk/python/src/zrok/environment/root.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/environment/root.py
rename to sdk/python/src/zrok/environment/root.py
diff --git a/sdk/python/sdk/zrok/zrok/listener.py b/sdk/python/src/zrok/listener.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/listener.py
rename to sdk/python/src/zrok/listener.py
diff --git a/sdk/python/sdk/zrok/zrok/model.py b/sdk/python/src/zrok/model.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/model.py
rename to sdk/python/src/zrok/model.py
diff --git a/sdk/python/sdk/zrok/zrok/overview.py b/sdk/python/src/zrok/overview.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/overview.py
rename to sdk/python/src/zrok/overview.py
diff --git a/sdk/python/sdk/zrok/zrok/proxy.py b/sdk/python/src/zrok/proxy.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/proxy.py
rename to sdk/python/src/zrok/proxy.py
diff --git a/sdk/python/sdk/zrok/zrok/share.py b/sdk/python/src/zrok/share.py
similarity index 100%
rename from sdk/python/sdk/zrok/zrok/share.py
rename to sdk/python/src/zrok/share.py