diff --git a/python/hsfs/client/__init__.py b/python/hopsworks_common/client/__init__.py
similarity index 100%
rename from python/hsfs/client/__init__.py
rename to python/hopsworks_common/client/__init__.py
diff --git a/python/hsfs/client/auth.py b/python/hopsworks_common/client/auth.py
similarity index 100%
rename from python/hsfs/client/auth.py
rename to python/hopsworks_common/client/auth.py
diff --git a/python/hsfs/client/base.py b/python/hopsworks_common/client/base.py
similarity index 100%
rename from python/hsfs/client/base.py
rename to python/hopsworks_common/client/base.py
diff --git a/python/hsfs/client/exceptions.py b/python/hopsworks_common/client/exceptions.py
similarity index 100%
rename from python/hsfs/client/exceptions.py
rename to python/hopsworks_common/client/exceptions.py
diff --git a/python/hsfs/client/external.py b/python/hopsworks_common/client/external.py
similarity index 100%
rename from python/hsfs/client/external.py
rename to python/hopsworks_common/client/external.py
diff --git a/python/hsfs/client/hopsworks.py b/python/hopsworks_common/client/hopsworks.py
similarity index 100%
rename from python/hsfs/client/hopsworks.py
rename to python/hopsworks_common/client/hopsworks.py
diff --git a/python/hsfs/client/online_store_rest_client.py b/python/hopsworks_common/client/online_store_rest_client.py
similarity index 100%
rename from python/hsfs/client/online_store_rest_client.py
rename to python/hopsworks_common/client/online_store_rest_client.py
diff --git a/python/hsfs/core/constants.py b/python/hopsworks_common/core/constants.py
similarity index 100%
rename from python/hsfs/core/constants.py
rename to python/hopsworks_common/core/constants.py
diff --git a/python/hopsworks/core/variable_api.py b/python/hopsworks_common/core/variable_api.py
similarity index 100%
rename from python/hopsworks/core/variable_api.py
rename to python/hopsworks_common/core/variable_api.py
diff --git a/python/hsfs/decorators.py b/python/hopsworks_common/decorators.py
similarity index 100%
rename from python/hsfs/decorators.py
rename to python/hopsworks_common/decorators.py