diff --git a/cli-client-new/pvc.py b/client-cli/pvc.py
similarity index 100%
rename from cli-client-new/pvc.py
rename to client-cli/pvc.py
diff --git a/cli-client-new/pvc/__init__.py b/client-cli/pvc/__init__.py
similarity index 100%
rename from cli-client-new/pvc/__init__.py
rename to client-cli/pvc/__init__.py
diff --git a/cli-client-new/pvc/cli/cli.py b/client-cli/pvc/cli/cli.py
similarity index 100%
rename from cli-client-new/pvc/cli/cli.py
rename to client-cli/pvc/cli/cli.py
diff --git a/cli-client-new/pvc/cli/formatters.py b/client-cli/pvc/cli/formatters.py
similarity index 100%
rename from cli-client-new/pvc/cli/formatters.py
rename to client-cli/pvc/cli/formatters.py
diff --git a/cli-client-new/pvc/cli/helpers.py b/client-cli/pvc/cli/helpers.py
similarity index 100%
rename from cli-client-new/pvc/cli/helpers.py
rename to client-cli/pvc/cli/helpers.py
diff --git a/cli-client-new/pvc/cli/parsers.py b/client-cli/pvc/cli/parsers.py
similarity index 100%
rename from cli-client-new/pvc/cli/parsers.py
rename to client-cli/pvc/cli/parsers.py
diff --git a/cli-client-new/pvc/cli/waiters.py b/client-cli/pvc/cli/waiters.py
similarity index 100%
rename from cli-client-new/pvc/cli/waiters.py
rename to client-cli/pvc/cli/waiters.py
diff --git a/cli-client-new/pvc/lib/__init__.py b/client-cli/pvc/lib/__init__.py
similarity index 100%
rename from cli-client-new/pvc/lib/__init__.py
rename to client-cli/pvc/lib/__init__.py
diff --git a/cli-client-new/pvc/lib/ansiprint.py b/client-cli/pvc/lib/ansiprint.py
similarity index 100%
rename from cli-client-new/pvc/lib/ansiprint.py
rename to client-cli/pvc/lib/ansiprint.py
diff --git a/cli-client-new/pvc/lib/cluster.py b/client-cli/pvc/lib/cluster.py
similarity index 100%
rename from cli-client-new/pvc/lib/cluster.py
rename to client-cli/pvc/lib/cluster.py
diff --git a/cli-client-new/pvc/lib/common.py b/client-cli/pvc/lib/common.py
similarity index 100%
rename from cli-client-new/pvc/lib/common.py
rename to client-cli/pvc/lib/common.py
diff --git a/cli-client-new/pvc/lib/network.py b/client-cli/pvc/lib/network.py
similarity index 100%
rename from cli-client-new/pvc/lib/network.py
rename to client-cli/pvc/lib/network.py
diff --git a/cli-client-new/pvc/lib/node.py b/client-cli/pvc/lib/node.py
similarity index 100%
rename from cli-client-new/pvc/lib/node.py
rename to client-cli/pvc/lib/node.py
diff --git a/cli-client-new/pvc/lib/provisioner.py b/client-cli/pvc/lib/provisioner.py
similarity index 100%
rename from cli-client-new/pvc/lib/provisioner.py
rename to client-cli/pvc/lib/provisioner.py
diff --git a/cli-client-new/pvc/lib/storage.py b/client-cli/pvc/lib/storage.py
similarity index 100%
rename from cli-client-new/pvc/lib/storage.py
rename to client-cli/pvc/lib/storage.py
diff --git a/cli-client-new/pvc/lib/vm.py b/client-cli/pvc/lib/vm.py
similarity index 100%
rename from cli-client-new/pvc/lib/vm.py
rename to client-cli/pvc/lib/vm.py
diff --git a/cli-client-new/pvc/lib/zkhandler.py b/client-cli/pvc/lib/zkhandler.py
similarity index 100%
rename from cli-client-new/pvc/lib/zkhandler.py
rename to client-cli/pvc/lib/zkhandler.py
diff --git a/cli-client-new/setup.py b/client-cli/setup.py
similarity index 100%
rename from cli-client-new/setup.py
rename to client-cli/setup.py