diff --git a/python/hopsworks/client/__init__.py b/python/hopsworks/client/__init__.py
new file mode 100644
index 000000000..19e0778da
--- /dev/null
+++ b/python/hopsworks/client/__init__.py
@@ -0,0 +1,32 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from hopsworks_common.client import (
+    get_instance,
+    get_python_version,
+    init,
+    set_python_version,
+    stop,
+)
+
+
+__all__ = [
+    get_instance,
+    get_python_version,
+    init,
+    set_python_version,
+    stop,
+]
diff --git a/python/hopsworks/client/auth.py b/python/hopsworks/client/auth.py
new file mode 100644
index 000000000..e2190d3da
--- /dev/null
+++ b/python/hopsworks/client/auth.py
@@ -0,0 +1,26 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from hopsworks_common.client.auth import (
+    ApiKeyAuth,
+    BearerAuth,
+)
+
+
+__all__ = [
+    ApiKeyAuth,
+    BearerAuth,
+]
diff --git a/python/hopsworks/client/base.py b/python/hopsworks/client/base.py
new file mode 100644
index 000000000..3ff35d800
--- /dev/null
+++ b/python/hopsworks/client/base.py
@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from hopsworks_common.client.base import (
+    Client,
+)
+
+
+__all__ = [
+    Client,
+]
diff --git a/python/hopsworks/client/exceptions.py b/python/hopsworks/client/exceptions.py
new file mode 100644
index 000000000..038c875d3
--- /dev/null
+++ b/python/hopsworks/client/exceptions.py
@@ -0,0 +1,44 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from hopsworks_common.client.exceptions import (
+    DatasetException,
+    EnvironmentException,
+    ExternalClientError,
+    GitException,
+    JobException,
+    JobExecutionException,
+    KafkaException,
+    OpenSearchException,
+    ProjectException,
+    RestAPIError,
+    UnknownSecretStorageError,
+)
+
+
+__all__ = [
+    DatasetException,
+    EnvironmentException,
+    ExternalClientError,
+    GitException,
+    JobException,
+    JobExecutionException,
+    KafkaException,
+    OpenSearchException,
+    ProjectException,
+    RestAPIError,
+    UnknownSecretStorageError,
+]
diff --git a/python/hopsworks/client/external.py b/python/hopsworks/client/external.py
new file mode 100644
index 000000000..1384b1c20
--- /dev/null
+++ b/python/hopsworks/client/external.py
@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from hopsworks_common.client.external import (
+    Client,
+)
+
+
+__all__ = [
+    Client,
+]
diff --git a/python/hopsworks/client/hopsworks.py b/python/hopsworks/client/hopsworks.py
new file mode 100644
index 000000000..c360b8cb9
--- /dev/null
+++ b/python/hopsworks/client/hopsworks.py
@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from hopsworks_common.client.hopsworks import (
+    Client,
+)
+
+
+__all__ = [
+    Client,
+]
diff --git a/python/hopsworks/decorators.py b/python/hopsworks/decorators.py
new file mode 100644
index 000000000..8fa55ac01
--- /dev/null
+++ b/python/hopsworks/decorators.py
@@ -0,0 +1,30 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from hopsworks_common.decorators import (
+    HopsworksConnectionError,
+    NoHopsworksConnectionError,
+    connected,
+    not_connected,
+)
+
+
+__all__ = [
+    HopsworksConnectionError,
+    NoHopsworksConnectionError,
+    connected,
+    not_connected,
+]
diff --git a/python/hopsworks_common/__init__.py b/python/hopsworks_common/__init__.py
new file mode 100644
index 000000000..ff8055b9b
--- /dev/null
+++ b/python/hopsworks_common/__init__.py
@@ -0,0 +1,15 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#