diff --git a/samples/src/logging.conf b/logging.conf
similarity index 100%
rename from samples/src/logging.conf
rename to logging.conf
diff --git a/samples/src/sample.cfg b/sample.cfg
similarity index 74%
rename from samples/src/sample.cfg
rename to sample.cfg
index fc02c5f7..bef64ac4 100644
--- a/samples/src/sample.cfg
+++ b/sample.cfg
@@ -1,5 +1,5 @@
 [connection]
-lswsdlurl=file:///path/to/the/VMware-vSphere-Automation-SDK-Python-<version>/client/wsdl/lookupservice.wsdl
+lswsdlurl=file:///path/to/the/VMware-vSphere-Automation-SDK-Python-<version>/vsphere/samples/workflow/wsdl/lookupservice.wsdl
 lssoapurl=https://myserver.mydomain.com/lookupservice/sdk
 ssousername=admin
 ssopassword=adminpassword
diff --git a/vSphere-Automation-Client-SDK-Python-README.html b/vSphere-Automation-Client-SDK-Python-README.html
index 78e058c4..f73ef93f 100644
--- a/vSphere-Automation-Client-SDK-Python-README.html
+++ b/vSphere-Automation-Client-SDK-Python-README.html
@@ -87,7 +87,7 @@ h4 {
 
 <p class="Nav">
 <img src="../docs/resources/page.gif" alt="Python SDK client samples README" width="13" height="16" border="0"></img> &nbsp;
-<a href="samples/vSphere-Automation-Client-SDK-Python-Samples-README.html" title="README for the Python SDK samples...">README for Python SDK samples</a><br />
+<a href="vsphere/vSphere-Automation-Client-SDK-Python-Samples-README.html" title="README for the Python SDK samples...">README for Python SDK samples</a><br />
 <img src="../docs/resources/page.gif" alt="vSphere Automation Python SDK README" width="13" height="16" border="0"></img> &nbsp;
 <a href="../vSphere-Automation-SDK-Python-README.html" title="vSphere Automation Python SDK README...">vSphere Automation Python SDK README</a><br />
 </p>
@@ -133,7 +133,7 @@ The following section describes the current directory contents:
 <tr>
 <td>samples</td>
 <td>Python samples that demonstrate the use of the vSphere Automation API</td>
-<td>See the <a href="samples/vSphere-Automation-Client-SDK-Python-Samples-README.html">Python samples README</a><br />
+<td>See the <a href="vsphere/vSphere-Automation-Client-SDK-Python-Samples-README.html">Python samples README</a><br />
 </td>
 </tr>
 
@@ -273,8 +273,8 @@ Use suds-jurko for python 3.x
 <a name="runningsample"></a>
 <h2>Running a sample</h2>
 
-Please refer to <a href="samples/vSphere-Automation-Client-SDK-Python-Samples-README.html#vcentersample">running a vcenter sample</a> for detailed steps to run a vCenter sample. <br/>
-Please refer to <a href="samples/vSphere-Automation-Client-SDK-Python-Samples-README.html#runningsample">running a workflow sample</a> for detailed steps to run a vCenter Single Sign-On, Content Library or Tagging sample.
+Please refer to <a href="vsphere/vSphere-Automation-Client-SDK-Python-Samples-README.html#vcentersample">running a vcenter sample</a> for detailed steps to run a vCenter sample. <br/>
+Please refer to <a href="vsphere/vSphere-Automation-Client-SDK-Python-Samples-README.html#runningsample">running a workflow sample</a> for detailed steps to run a vCenter Single Sign-On, Content Library or Tagging sample.
 
 <ul>
 <li><strong>run_sample.sh</strong> is needed for running the samples in UNIX/mac OS X environment</li>
diff --git a/samples/src/vsphere/__init__.py b/vsphere/__init__.py
similarity index 100%
rename from samples/src/vsphere/__init__.py
rename to vsphere/__init__.py
diff --git a/samples/src/vsphere/samples/__init__.py b/vsphere/samples/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/__init__.py
rename to vsphere/samples/__init__.py
diff --git a/samples/src/vsphere/samples/common/__init__.py b/vsphere/samples/common/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/common/__init__.py
rename to vsphere/samples/common/__init__.py
diff --git a/samples/src/vsphere/samples/common/id_generator.py b/vsphere/samples/common/id_generator.py
similarity index 100%
rename from samples/src/vsphere/samples/common/id_generator.py
rename to vsphere/samples/common/id_generator.py
diff --git a/samples/src/vsphere/samples/common/logging_context.py b/vsphere/samples/common/logging_context.py
similarity index 100%
rename from samples/src/vsphere/samples/common/logging_context.py
rename to vsphere/samples/common/logging_context.py
diff --git a/samples/src/vsphere/samples/common/lookup_service_helper.py b/vsphere/samples/common/lookup_service_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/common/lookup_service_helper.py
rename to vsphere/samples/common/lookup_service_helper.py
diff --git a/samples/src/vsphere/samples/common/platform_service_controller.py b/vsphere/samples/common/platform_service_controller.py
similarity index 100%
rename from samples/src/vsphere/samples/common/platform_service_controller.py
rename to vsphere/samples/common/platform_service_controller.py
diff --git a/samples/src/vsphere/samples/common/sample_base.py b/vsphere/samples/common/sample_base.py
similarity index 100%
rename from samples/src/vsphere/samples/common/sample_base.py
rename to vsphere/samples/common/sample_base.py
diff --git a/samples/src/vsphere/samples/common/sample_cli.py b/vsphere/samples/common/sample_cli.py
similarity index 100%
rename from samples/src/vsphere/samples/common/sample_cli.py
rename to vsphere/samples/common/sample_cli.py
diff --git a/samples/src/vsphere/samples/common/sample_config.py b/vsphere/samples/common/sample_config.py
similarity index 100%
rename from samples/src/vsphere/samples/common/sample_config.py
rename to vsphere/samples/common/sample_config.py
diff --git a/samples/src/vsphere/samples/common/sample_util.py b/vsphere/samples/common/sample_util.py
similarity index 100%
rename from samples/src/vsphere/samples/common/sample_util.py
rename to vsphere/samples/common/sample_util.py
diff --git a/samples/src/vsphere/samples/common/service_manager.py b/vsphere/samples/common/service_manager.py
similarity index 100%
rename from samples/src/vsphere/samples/common/service_manager.py
rename to vsphere/samples/common/service_manager.py
diff --git a/samples/src/vsphere/samples/common/service_manager_factory.py b/vsphere/samples/common/service_manager_factory.py
similarity index 100%
rename from samples/src/vsphere/samples/common/service_manager_factory.py
rename to vsphere/samples/common/service_manager_factory.py
diff --git a/samples/src/vsphere/samples/common/ssl_helper.py b/vsphere/samples/common/ssl_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/common/ssl_helper.py
rename to vsphere/samples/common/ssl_helper.py
diff --git a/samples/src/vsphere/samples/common/sso.py b/vsphere/samples/common/sso.py
similarity index 100%
rename from samples/src/vsphere/samples/common/sso.py
rename to vsphere/samples/common/sso.py
diff --git a/samples/src/vsphere/samples/common/vapiconnect.py b/vsphere/samples/common/vapiconnect.py
similarity index 100%
rename from samples/src/vsphere/samples/common/vapiconnect.py
rename to vsphere/samples/common/vapiconnect.py
diff --git a/samples/src/vsphere/samples/contentlibrary/README.md b/vsphere/samples/contentlibrary/README.md
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/README.md
rename to vsphere/samples/contentlibrary/README.md
diff --git a/samples/src/vsphere/samples/contentlibrary/__init__.py b/vsphere/samples/contentlibrary/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/__init__.py
rename to vsphere/samples/contentlibrary/__init__.py
diff --git a/samples/src/vsphere/samples/contentlibrary/contentupdate/__init__.py b/vsphere/samples/contentlibrary/contentupdate/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/contentupdate/__init__.py
rename to vsphere/samples/contentlibrary/contentupdate/__init__.py
diff --git a/samples/src/vsphere/samples/contentlibrary/contentupdate/content_update.py b/vsphere/samples/contentlibrary/contentupdate/content_update.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/contentupdate/content_update.py
rename to vsphere/samples/contentlibrary/contentupdate/content_update.py
diff --git a/samples/src/vsphere/samples/contentlibrary/crud/__init__.py b/vsphere/samples/contentlibrary/crud/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/crud/__init__.py
rename to vsphere/samples/contentlibrary/crud/__init__.py
diff --git a/samples/src/vsphere/samples/contentlibrary/crud/library_crud.py b/vsphere/samples/contentlibrary/crud/library_crud.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/crud/library_crud.py
rename to vsphere/samples/contentlibrary/crud/library_crud.py
diff --git a/samples/src/vsphere/samples/contentlibrary/isomount/__init__.py b/vsphere/samples/contentlibrary/isomount/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/isomount/__init__.py
rename to vsphere/samples/contentlibrary/isomount/__init__.py
diff --git a/samples/src/vsphere/samples/contentlibrary/isomount/iso_mount.py b/vsphere/samples/contentlibrary/isomount/iso_mount.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/isomount/iso_mount.py
rename to vsphere/samples/contentlibrary/isomount/iso_mount.py
diff --git a/samples/src/vsphere/samples/contentlibrary/lib/__init__.py b/vsphere/samples/contentlibrary/lib/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/lib/__init__.py
rename to vsphere/samples/contentlibrary/lib/__init__.py
diff --git a/samples/src/vsphere/samples/contentlibrary/lib/cls_api_client.py b/vsphere/samples/contentlibrary/lib/cls_api_client.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/lib/cls_api_client.py
rename to vsphere/samples/contentlibrary/lib/cls_api_client.py
diff --git a/samples/src/vsphere/samples/contentlibrary/lib/cls_api_helper.py b/vsphere/samples/contentlibrary/lib/cls_api_helper.py
similarity index 98%
rename from samples/src/vsphere/samples/contentlibrary/lib/cls_api_helper.py
rename to vsphere/samples/contentlibrary/lib/cls_api_helper.py
index 7bae7045..0a680a45 100644
--- a/samples/src/vsphere/samples/contentlibrary/lib/cls_api_helper.py
+++ b/vsphere/samples/contentlibrary/lib/cls_api_helper.py
@@ -42,9 +42,9 @@ class ClsApiHelper(object):
 
     """
 
-    ISO_FILE_RELATIVE_DIR = '../../../../../resources/isoImages/'
-    PLAIN_OVF_RELATIVE_DIR = '../../../../../resources/plainVmTemplate'
-    SIMPLE_OVF_RELATIVE_DIR = '../../../../../resources/simpleVmTemplate'
+    ISO_FILE_RELATIVE_DIR = '../resources/isoImages/'
+    PLAIN_OVF_RELATIVE_DIR = '../resources/plainVmTemplate'
+    SIMPLE_OVF_RELATIVE_DIR = '../resources/simpleVmTemplate'
 
     def __init__(self, cls_api_client, skip_verification):
         self.client = cls_api_client
diff --git a/samples/src/vsphere/samples/contentlibrary/lib/cls_sync_helper.py b/vsphere/samples/contentlibrary/lib/cls_sync_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/lib/cls_sync_helper.py
rename to vsphere/samples/contentlibrary/lib/cls_sync_helper.py
diff --git a/samples/src/vsphere/samples/contentlibrary/ovfdeploy/__init__.py b/vsphere/samples/contentlibrary/ovfdeploy/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/ovfdeploy/__init__.py
rename to vsphere/samples/contentlibrary/ovfdeploy/__init__.py
diff --git a/samples/src/vsphere/samples/contentlibrary/ovfdeploy/deploy_ovf_template.py b/vsphere/samples/contentlibrary/ovfdeploy/deploy_ovf_template.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/ovfdeploy/deploy_ovf_template.py
rename to vsphere/samples/contentlibrary/ovfdeploy/deploy_ovf_template.py
diff --git a/samples/src/vsphere/samples/contentlibrary/ovfimport/__init__.py b/vsphere/samples/contentlibrary/ovfimport/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/ovfimport/__init__.py
rename to vsphere/samples/contentlibrary/ovfimport/__init__.py
diff --git a/samples/src/vsphere/samples/contentlibrary/ovfimport/ovf_import_export.py b/vsphere/samples/contentlibrary/ovfimport/ovf_import_export.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/ovfimport/ovf_import_export.py
rename to vsphere/samples/contentlibrary/ovfimport/ovf_import_export.py
diff --git a/samples/src/vsphere/samples/contentlibrary/publishsubscribe/__init__.py b/vsphere/samples/contentlibrary/publishsubscribe/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/publishsubscribe/__init__.py
rename to vsphere/samples/contentlibrary/publishsubscribe/__init__.py
diff --git a/samples/src/vsphere/samples/contentlibrary/publishsubscribe/library_publish_subscribe.py b/vsphere/samples/contentlibrary/publishsubscribe/library_publish_subscribe.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/publishsubscribe/library_publish_subscribe.py
rename to vsphere/samples/contentlibrary/publishsubscribe/library_publish_subscribe.py
diff --git a/samples/resources/isoImages/test-2.iso b/vsphere/samples/contentlibrary/resources/isoImages/test-2.iso
similarity index 100%
rename from samples/resources/isoImages/test-2.iso
rename to vsphere/samples/contentlibrary/resources/isoImages/test-2.iso
diff --git a/samples/resources/isoImages/test.iso b/vsphere/samples/contentlibrary/resources/isoImages/test.iso
similarity index 100%
rename from samples/resources/isoImages/test.iso
rename to vsphere/samples/contentlibrary/resources/isoImages/test.iso
diff --git a/samples/resources/plainVmTemplate/plain-vm.ovf b/vsphere/samples/contentlibrary/resources/plainVmTemplate/plain-vm.ovf
similarity index 100%
rename from samples/resources/plainVmTemplate/plain-vm.ovf
rename to vsphere/samples/contentlibrary/resources/plainVmTemplate/plain-vm.ovf
diff --git a/samples/resources/plainVmTemplate/plain-vm.vmdk b/vsphere/samples/contentlibrary/resources/plainVmTemplate/plain-vm.vmdk
similarity index 100%
rename from samples/resources/plainVmTemplate/plain-vm.vmdk
rename to vsphere/samples/contentlibrary/resources/plainVmTemplate/plain-vm.vmdk
diff --git a/samples/resources/simpleVmTemplate/descriptor.ovf b/vsphere/samples/contentlibrary/resources/simpleVmTemplate/descriptor.ovf
similarity index 100%
rename from samples/resources/simpleVmTemplate/descriptor.ovf
rename to vsphere/samples/contentlibrary/resources/simpleVmTemplate/descriptor.ovf
diff --git a/samples/resources/simpleVmTemplate/disk-0.vmdk b/vsphere/samples/contentlibrary/resources/simpleVmTemplate/disk-0.vmdk
similarity index 100%
rename from samples/resources/simpleVmTemplate/disk-0.vmdk
rename to vsphere/samples/contentlibrary/resources/simpleVmTemplate/disk-0.vmdk
diff --git a/samples/src/vsphere/samples/contentlibrary/vmcapture/__init__.py b/vsphere/samples/contentlibrary/vmcapture/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/vmcapture/__init__.py
rename to vsphere/samples/contentlibrary/vmcapture/__init__.py
diff --git a/samples/src/vsphere/samples/contentlibrary/vmcapture/vm_template_capture.py b/vsphere/samples/contentlibrary/vmcapture/vm_template_capture.py
similarity index 100%
rename from samples/src/vsphere/samples/contentlibrary/vmcapture/vm_template_capture.py
rename to vsphere/samples/contentlibrary/vmcapture/vm_template_capture.py
diff --git a/samples/src/vsphere/samples/inventory/__init__.py b/vsphere/samples/inventory/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/inventory/__init__.py
rename to vsphere/samples/inventory/__init__.py
diff --git a/samples/src/vsphere/samples/inventory/find_cl_datastore.py b/vsphere/samples/inventory/find_cl_datastore.py
similarity index 100%
rename from samples/src/vsphere/samples/inventory/find_cl_datastore.py
rename to vsphere/samples/inventory/find_cl_datastore.py
diff --git a/samples/src/vsphere/samples/lookupservice/__init__.py b/vsphere/samples/lookupservice/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/lookupservice/__init__.py
rename to vsphere/samples/lookupservice/__init__.py
diff --git a/samples/src/vsphere/samples/lookupservice/print_services.py b/vsphere/samples/lookupservice/print_services.py
similarity index 100%
rename from samples/src/vsphere/samples/lookupservice/print_services.py
rename to vsphere/samples/lookupservice/print_services.py
diff --git a/samples/src/vsphere/samples/tagging/__init__.py b/vsphere/samples/tagging/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/tagging/__init__.py
rename to vsphere/samples/tagging/__init__.py
diff --git a/samples/src/vsphere/samples/tagging/tagging_workflow.py b/vsphere/samples/tagging/tagging_workflow.py
similarity index 100%
rename from samples/src/vsphere/samples/tagging/tagging_workflow.py
rename to vsphere/samples/tagging/tagging_workflow.py
diff --git a/samples/src/vsphere/samples/vcenter/__init__.py b/vsphere/samples/vcenter/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/__init__.py
rename to vsphere/samples/vcenter/__init__.py
diff --git a/samples/src/vsphere/samples/vcenter/helper/__init__.py b/vsphere/samples/vcenter/helper/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/helper/__init__.py
rename to vsphere/samples/vcenter/helper/__init__.py
diff --git a/samples/src/vsphere/samples/vcenter/helper/cluster_helper.py b/vsphere/samples/vcenter/helper/cluster_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/helper/cluster_helper.py
rename to vsphere/samples/vcenter/helper/cluster_helper.py
diff --git a/samples/src/vsphere/samples/vcenter/helper/datacenter_helper.py b/vsphere/samples/vcenter/helper/datacenter_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/helper/datacenter_helper.py
rename to vsphere/samples/vcenter/helper/datacenter_helper.py
diff --git a/samples/src/vsphere/samples/vcenter/helper/datastore_helper.py b/vsphere/samples/vcenter/helper/datastore_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/helper/datastore_helper.py
rename to vsphere/samples/vcenter/helper/datastore_helper.py
diff --git a/samples/src/vsphere/samples/vcenter/helper/folder_helper.py b/vsphere/samples/vcenter/helper/folder_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/helper/folder_helper.py
rename to vsphere/samples/vcenter/helper/folder_helper.py
diff --git a/samples/src/vsphere/samples/vcenter/helper/network_helper.py b/vsphere/samples/vcenter/helper/network_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/helper/network_helper.py
rename to vsphere/samples/vcenter/helper/network_helper.py
diff --git a/samples/src/vsphere/samples/vcenter/helper/resource_pool_helper.py b/vsphere/samples/vcenter/helper/resource_pool_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/helper/resource_pool_helper.py
rename to vsphere/samples/vcenter/helper/resource_pool_helper.py
diff --git a/samples/src/vsphere/samples/vcenter/helper/vm_helper.py b/vsphere/samples/vcenter/helper/vm_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/helper/vm_helper.py
rename to vsphere/samples/vcenter/helper/vm_helper.py
diff --git a/samples/src/vsphere/samples/vcenter/helper/vm_placement_helper.py b/vsphere/samples/vcenter/helper/vm_placement_helper.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/helper/vm_placement_helper.py
rename to vsphere/samples/vcenter/helper/vm_placement_helper.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/README.md b/vsphere/samples/vcenter/setup/README.md
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/README.md
rename to vsphere/samples/vcenter/setup/README.md
diff --git a/samples/src/vsphere/samples/vcenter/setup/__init__.py b/vsphere/samples/vcenter/setup/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/__init__.py
rename to vsphere/samples/vcenter/setup/__init__.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/backend_directory.py b/vsphere/samples/vcenter/setup/backend_directory.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/backend_directory.py
rename to vsphere/samples/vcenter/setup/backend_directory.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/cluster.py b/vsphere/samples/vcenter/setup/cluster.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/cluster.py
rename to vsphere/samples/vcenter/setup/cluster.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/datacenter.py b/vsphere/samples/vcenter/setup/datacenter.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/datacenter.py
rename to vsphere/samples/vcenter/setup/datacenter.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/datastore.py b/vsphere/samples/vcenter/setup/datastore.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/datastore.py
rename to vsphere/samples/vcenter/setup/datastore.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/floppy_image.py b/vsphere/samples/vcenter/setup/floppy_image.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/floppy_image.py
rename to vsphere/samples/vcenter/setup/floppy_image.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/folder.py b/vsphere/samples/vcenter/setup/folder.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/folder.py
rename to vsphere/samples/vcenter/setup/folder.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/host.py b/vsphere/samples/vcenter/setup/host.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/host.py
rename to vsphere/samples/vcenter/setup/host.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/iso_image.py b/vsphere/samples/vcenter/setup/iso_image.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/iso_image.py
rename to vsphere/samples/vcenter/setup/iso_image.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/main.py b/vsphere/samples/vcenter/setup/main.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/main.py
rename to vsphere/samples/vcenter/setup/main.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/network.py b/vsphere/samples/vcenter/setup/network.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/network.py
rename to vsphere/samples/vcenter/setup/network.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/setup_cli.py b/vsphere/samples/vcenter/setup/setup_cli.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/setup_cli.py
rename to vsphere/samples/vcenter/setup/setup_cli.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/testbed.py b/vsphere/samples/vcenter/setup/testbed.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/testbed.py
rename to vsphere/samples/vcenter/setup/testbed.py
diff --git a/samples/src/vsphere/samples/vcenter/setup/testbed_setup.py b/vsphere/samples/vcenter/setup/testbed_setup.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/setup/testbed_setup.py
rename to vsphere/samples/vcenter/setup/testbed_setup.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/README.md b/vsphere/samples/vcenter/vm/README.md
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/README.md
rename to vsphere/samples/vcenter/vm/README.md
diff --git a/samples/src/vsphere/samples/vcenter/vm/__init__.py b/vsphere/samples/vcenter/vm/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/__init__.py
rename to vsphere/samples/vcenter/vm/__init__.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/create/__init__.py b/vsphere/samples/vcenter/vm/create/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/create/__init__.py
rename to vsphere/samples/vcenter/vm/create/__init__.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/create/create_basic_vm.py b/vsphere/samples/vcenter/vm/create/create_basic_vm.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/create/create_basic_vm.py
rename to vsphere/samples/vcenter/vm/create/create_basic_vm.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/create/create_default_vm.py b/vsphere/samples/vcenter/vm/create/create_default_vm.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/create/create_default_vm.py
rename to vsphere/samples/vcenter/vm/create/create_default_vm.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/create/create_exhaustive_vm.py b/vsphere/samples/vcenter/vm/create/create_exhaustive_vm.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/create/create_exhaustive_vm.py
rename to vsphere/samples/vcenter/vm/create/create_exhaustive_vm.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/README.md b/vsphere/samples/vcenter/vm/hardware/README.md
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/README.md
rename to vsphere/samples/vcenter/vm/hardware/README.md
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/__init__.py b/vsphere/samples/vcenter/vm/hardware/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/__init__.py
rename to vsphere/samples/vcenter/vm/hardware/__init__.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/adapter/__init__.py b/vsphere/samples/vcenter/vm/hardware/adapter/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/adapter/__init__.py
rename to vsphere/samples/vcenter/vm/hardware/adapter/__init__.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/adapter/sata.py b/vsphere/samples/vcenter/vm/hardware/adapter/sata.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/adapter/sata.py
rename to vsphere/samples/vcenter/vm/hardware/adapter/sata.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/adapter/scsi.py b/vsphere/samples/vcenter/vm/hardware/adapter/scsi.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/adapter/scsi.py
rename to vsphere/samples/vcenter/vm/hardware/adapter/scsi.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/boot.py b/vsphere/samples/vcenter/vm/hardware/boot.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/boot.py
rename to vsphere/samples/vcenter/vm/hardware/boot.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/boot_device.py b/vsphere/samples/vcenter/vm/hardware/boot_device.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/boot_device.py
rename to vsphere/samples/vcenter/vm/hardware/boot_device.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/cdrom.py b/vsphere/samples/vcenter/vm/hardware/cdrom.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/cdrom.py
rename to vsphere/samples/vcenter/vm/hardware/cdrom.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/cpu.py b/vsphere/samples/vcenter/vm/hardware/cpu.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/cpu.py
rename to vsphere/samples/vcenter/vm/hardware/cpu.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/disk.py b/vsphere/samples/vcenter/vm/hardware/disk.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/disk.py
rename to vsphere/samples/vcenter/vm/hardware/disk.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/ethernet.py b/vsphere/samples/vcenter/vm/hardware/ethernet.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/ethernet.py
rename to vsphere/samples/vcenter/vm/hardware/ethernet.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/floppy.py b/vsphere/samples/vcenter/vm/hardware/floppy.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/floppy.py
rename to vsphere/samples/vcenter/vm/hardware/floppy.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/main.py b/vsphere/samples/vcenter/vm/hardware/main.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/main.py
rename to vsphere/samples/vcenter/vm/hardware/main.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/memory.py b/vsphere/samples/vcenter/vm/hardware/memory.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/memory.py
rename to vsphere/samples/vcenter/vm/hardware/memory.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/parallel.py b/vsphere/samples/vcenter/vm/hardware/parallel.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/parallel.py
rename to vsphere/samples/vcenter/vm/hardware/parallel.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/hardware/serial.py b/vsphere/samples/vcenter/vm/hardware/serial.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/hardware/serial.py
rename to vsphere/samples/vcenter/vm/hardware/serial.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/main.py b/vsphere/samples/vcenter/vm/main.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/main.py
rename to vsphere/samples/vcenter/vm/main.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/placement.py b/vsphere/samples/vcenter/vm/placement.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/placement.py
rename to vsphere/samples/vcenter/vm/placement.py
diff --git a/samples/src/vsphere/samples/vcenter/vm/power.py b/vsphere/samples/vcenter/vm/power.py
similarity index 100%
rename from samples/src/vsphere/samples/vcenter/vm/power.py
rename to vsphere/samples/vcenter/vm/power.py
diff --git a/samples/src/vsphere/samples/vim/__init__.py b/vsphere/samples/vim/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/vim/__init__.py
rename to vsphere/samples/vim/__init__.py
diff --git a/samples/src/vsphere/samples/vim/datastore_file.py b/vsphere/samples/vim/datastore_file.py
similarity index 100%
rename from samples/src/vsphere/samples/vim/datastore_file.py
rename to vsphere/samples/vim/datastore_file.py
diff --git a/samples/src/vsphere/samples/vim/file.py b/vsphere/samples/vim/file.py
similarity index 100%
rename from samples/src/vsphere/samples/vim/file.py
rename to vsphere/samples/vim/file.py
diff --git a/samples/src/vsphere/samples/vim/helpers/__init__.py b/vsphere/samples/vim/helpers/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/vim/helpers/__init__.py
rename to vsphere/samples/vim/helpers/__init__.py
diff --git a/samples/src/vsphere/samples/vim/helpers/get_cluster_by_name.py b/vsphere/samples/vim/helpers/get_cluster_by_name.py
similarity index 100%
rename from samples/src/vsphere/samples/vim/helpers/get_cluster_by_name.py
rename to vsphere/samples/vim/helpers/get_cluster_by_name.py
diff --git a/samples/src/vsphere/samples/vim/helpers/get_datastore_by_name.py b/vsphere/samples/vim/helpers/get_datastore_by_name.py
similarity index 100%
rename from samples/src/vsphere/samples/vim/helpers/get_datastore_by_name.py
rename to vsphere/samples/vim/helpers/get_datastore_by_name.py
diff --git a/samples/src/vsphere/samples/vim/helpers/vim_utils.py b/vsphere/samples/vim/helpers/vim_utils.py
similarity index 100%
rename from samples/src/vsphere/samples/vim/helpers/vim_utils.py
rename to vsphere/samples/vim/helpers/vim_utils.py
diff --git a/samples/src/vsphere/samples/vim/inventory.py b/vsphere/samples/vim/inventory.py
similarity index 100%
rename from samples/src/vsphere/samples/vim/inventory.py
rename to vsphere/samples/vim/inventory.py
diff --git a/samples/src/vsphere/samples/vim/vmdk.py b/vsphere/samples/vim/vmdk.py
similarity index 100%
rename from samples/src/vsphere/samples/vim/vmdk.py
rename to vsphere/samples/vim/vmdk.py
diff --git a/samples/src/vsphere/samples/workflow/__init__.py b/vsphere/samples/workflow/__init__.py
similarity index 100%
rename from samples/src/vsphere/samples/workflow/__init__.py
rename to vsphere/samples/workflow/__init__.py
diff --git a/samples/src/vsphere/samples/workflow/connection_workflow.py b/vsphere/samples/workflow/connection_workflow.py
similarity index 100%
rename from samples/src/vsphere/samples/workflow/connection_workflow.py
rename to vsphere/samples/workflow/connection_workflow.py
diff --git a/samples/src/vsphere/samples/workflow/vapi_connection_workflow.py b/vsphere/samples/workflow/vapi_connection_workflow.py
similarity index 100%
rename from samples/src/vsphere/samples/workflow/vapi_connection_workflow.py
rename to vsphere/samples/workflow/vapi_connection_workflow.py
diff --git a/wsdl/lookup.wsdl b/vsphere/samples/workflow/wsdl/lookup.wsdl
similarity index 100%
rename from wsdl/lookup.wsdl
rename to vsphere/samples/workflow/wsdl/lookup.wsdl
diff --git a/wsdl/lookupservice.wsdl b/vsphere/samples/workflow/wsdl/lookupservice.wsdl
similarity index 100%
rename from wsdl/lookupservice.wsdl
rename to vsphere/samples/workflow/wsdl/lookupservice.wsdl
diff --git a/samples/vSphere-Automation-Client-SDK-Python-Samples-README.html b/vsphere/vSphere-Automation-Client-SDK-Python-Samples-README.html
similarity index 100%
rename from samples/vSphere-Automation-Client-SDK-Python-Samples-README.html
rename to vsphere/vSphere-Automation-Client-SDK-Python-Samples-README.html