diff --git a/samples/__init__.py b/samples/__init__.py
index 1b821c35..0613959c 100644
--- a/samples/__init__.py
+++ b/samples/__init__.py
@@ -1,3 +1,19 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 # Required to distribute different parts of this
 # package as multiple distribution
 try:
@@ -5,4 +21,4 @@ try:
     pkg_resources.declare_namespace(__name__)
 except ImportError:
     from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
\ No newline at end of file
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vsphere/__init__.py b/samples/vsphere/__init__.py
index e69de29b..0613959c 100644
--- a/samples/vsphere/__init__.py
+++ b/samples/vsphere/__init__.py
@@ -0,0 +1,24 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
+# Required to distribute different parts of this
+# package as multiple distribution
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vsphere/common/id_generator.py b/samples/vsphere/common/id_generator.py
index 398d74b8..6c42bfe7 100644
--- a/samples/vsphere/common/id_generator.py
+++ b/samples/vsphere/common/id_generator.py
@@ -28,7 +28,7 @@ def rand(value):
 
 
 def generate_random_string(length):
-    return (''.join(random.choice(string.ascii_uppercase) for _i in range(length)))
+    return ''.join(random.choice(string.ascii_uppercase) for _i in range(length))
 
 
 def main():
diff --git a/samples/vsphere/common/lookup_service_helper.py b/samples/vsphere/common/lookup_service_helper.py
index 56aa7765..67572050 100644
--- a/samples/vsphere/common/lookup_service_helper.py
+++ b/samples/vsphere/common/lookup_service_helper.py
@@ -308,7 +308,7 @@ class LookupServiceHelper(object):
             raise Exception('No management node found')
         if len(result) > 1:
             raise MultipleManagementNodeException(MultipleManagementNodeException.format(result))
-        return (list(result.keys())[0], list(result.values())[0])  # python 3.x dict.keys() returns a view rather than a list
+        return list(result.keys())[0], list(result.values())[0]  # python 3.x dict.keys() returns a view rather than a list
 
 
 class MultipleManagementNodeException(Exception):
diff --git a/samples/vsphere/common/platform_service_controller.py b/samples/vsphere/common/platform_service_controller.py
index 3c142b79..e0cc2712 100644
--- a/samples/vsphere/common/platform_service_controller.py
+++ b/samples/vsphere/common/platform_service_controller.py
@@ -10,7 +10,6 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
-
 __author__ = 'VMware, Inc.'
 __copyright__ = 'Copyright 2013, 2016 VMware, Inc. All rights reserved.'
 
@@ -21,7 +20,6 @@ from samples.vsphere.common.lookup_service_helper import LookupServiceHelper
 from samples.vsphere.common.ssl_helper import get_unverified_context
 
 
-
 class PlatformServiceController(object):
     """
     Manages services on the infrastructure node (e.g. lookup service, SSO etc.)
diff --git a/samples/vsphere/common/sample_cli.py b/samples/vsphere/common/sample_cli.py
index ed248d8d..292c77c1 100644
--- a/samples/vsphere/common/sample_cli.py
+++ b/samples/vsphere/common/sample_cli.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import argparse
 
 
diff --git a/samples/vsphere/common/sample_util.py b/samples/vsphere/common/sample_util.py
index 5d5da362..921abad7 100644
--- a/samples/vsphere/common/sample_util.py
+++ b/samples/vsphere/common/sample_util.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from six.moves import cStringIO
 from vmware.vapi.bindings.struct import PrettyPrinter
 
diff --git a/samples/vsphere/common/ssl_helper.py b/samples/vsphere/common/ssl_helper.py
index c7ca1fea..f93cc639 100644
--- a/samples/vsphere/common/ssl_helper.py
+++ b/samples/vsphere/common/ssl_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import ssl
 
 def get_unverified_context():
diff --git a/samples/vsphere/common/vapiconnect.py b/samples/vsphere/common/vapiconnect.py
index d59caa3a..222b1332 100644
--- a/samples/vsphere/common/vapiconnect.py
+++ b/samples/vsphere/common/vapiconnect.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import requests
 
 from com.vmware.cis_client import Session
diff --git a/samples/vsphere/common/vim/datastore_file.py b/samples/vsphere/common/vim/datastore_file.py
index d127c5a1..ed4abd1a 100644
--- a/samples/vsphere/common/vim/datastore_file.py
+++ b/samples/vsphere/common/vim/datastore_file.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import pyVim.task
 import requests
 from pyVmomi import vim
diff --git a/samples/vsphere/common/vim/file.py b/samples/vsphere/common/vim/file.py
index 63b629e5..ea331599 100644
--- a/samples/vsphere/common/vim/file.py
+++ b/samples/vsphere/common/vim/file.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import re
 
 from samples.vsphere.common.vim.inventory import get_datastore_mo
@@ -24,8 +27,8 @@ def parse_datastore_path(datastore_path):
     m = datastore_path_regex.match(datastore_path)
     if m:
         (datastore_name, path) = m.groups()
-        return (datastore_name, path)
-    return (None, None)
+        return datastore_name, path
+    return None, None
 
 
 def detect_directory(context, description, datacenter_name, datastore_path):
diff --git a/samples/vsphere/common/vim/inventory.py b/samples/vsphere/common/vim/inventory.py
index e5b9a38d..7a52b740 100644
--- a/samples/vsphere/common/vim/inventory.py
+++ b/samples/vsphere/common/vim/inventory.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+__vcenter__ = 'since 6.0'
+
 from pyVmomi import vim
 
 from samples.vsphere.vcenter.helper.datastore_helper import get_datastore
diff --git a/samples/vsphere/common/vim/vmdk.py b/samples/vsphere/common/vim/vmdk.py
index f208eb05..493f3300 100644
--- a/samples/vsphere/common/vim/vmdk.py
+++ b/samples/vsphere/common/vim/vmdk.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import pyVim.task
 from pyVmomi import vim
 from samples.vsphere.common.vim.inventory import get_datastore_mo
diff --git a/samples/vsphere/contentlibrary/__init__.py b/samples/vsphere/contentlibrary/__init__.py
index 0e0d0aa3..ecb4de9e 100644
--- a/samples/vsphere/contentlibrary/__init__.py
+++ b/samples/vsphere/contentlibrary/__init__.py
@@ -12,7 +12,7 @@
 
 
 __author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
 
 
 # Required to distribute different parts of this
diff --git a/samples/vsphere/contentlibrary/contentupdate/content_update.py b/samples/vsphere/contentlibrary/contentupdate/content_update.py
index 3519b182..692232d7 100644
--- a/samples/vsphere/contentlibrary/contentupdate/content_update.py
+++ b/samples/vsphere/contentlibrary/contentupdate/content_update.py
@@ -8,6 +8,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 try:
     import urllib2
 except ImportError:
@@ -19,9 +22,6 @@ from samples.vsphere.common.sample_base import SampleBase
 from samples.vsphere.contentlibrary.lib.cls_api_client import ClsApiClient
 from samples.vsphere.contentlibrary.lib.cls_api_helper import ClsApiHelper
 
-__author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
-
 
 class ContentUpdate(SampleBase):
     """
diff --git a/samples/vsphere/contentlibrary/crud/library_crud.py b/samples/vsphere/contentlibrary/crud/library_crud.py
index 834aa92c..26e237b6 100644
--- a/samples/vsphere/contentlibrary/crud/library_crud.py
+++ b/samples/vsphere/contentlibrary/crud/library_crud.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.content.library_client import StorageBacking
 from com.vmware.content_client import LibraryModel
 
@@ -20,9 +23,6 @@ from samples.vsphere.common.sample_base import SampleBase
 from samples.vsphere.common.vim.helpers.get_datastore_by_name import get_datastore_id
 from samples.vsphere.contentlibrary.lib.cls_api_client import ClsApiClient
 
-__author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
-
 
 class LibraryCrud(SampleBase):
     """
diff --git a/samples/vsphere/contentlibrary/isomount/iso_mount.py b/samples/vsphere/contentlibrary/isomount/iso_mount.py
index 1a34ed6f..520cc45f 100644
--- a/samples/vsphere/contentlibrary/isomount/iso_mount.py
+++ b/samples/vsphere/contentlibrary/isomount/iso_mount.py
@@ -12,16 +12,15 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from samples.vsphere.common.sample_base import SampleBase
 from samples.vsphere.contentlibrary.lib.cls_api_client import ClsApiClient
 from samples.vsphere.contentlibrary.lib.cls_api_helper import ClsApiHelper
 
 from samples.vsphere.vcenter.helper.vm_helper import get_vm
 
-__author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
-
-
 class IsoMount(SampleBase):
     """
     Demonstrates the content library ISO item mount and
diff --git a/samples/vsphere/contentlibrary/lib/cls_api_client.py b/samples/vsphere/contentlibrary/lib/cls_api_client.py
index 6ce4df73..74df1e8e 100644
--- a/samples/vsphere/contentlibrary/lib/cls_api_client.py
+++ b/samples/vsphere/contentlibrary/lib/cls_api_client.py
@@ -10,6 +10,8 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
 
 from com.vmware.content_client import (Library,
                                        LocalLibrary,
@@ -24,10 +26,6 @@ from com.vmware.vcenter.iso_client import Image
 from com.vmware.vcenter.ovf_client import LibraryItem
 
 
-__author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
-
-
 class ClsApiClient(object):
     """
     This is a simplified wrapper around the Content Library APIs.
diff --git a/samples/vsphere/contentlibrary/lib/cls_api_helper.py b/samples/vsphere/contentlibrary/lib/cls_api_helper.py
index 04c2e13f..14edcdcd 100644
--- a/samples/vsphere/contentlibrary/lib/cls_api_helper.py
+++ b/samples/vsphere/contentlibrary/lib/cls_api_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
+
 import os
 import ssl
 import time
@@ -29,9 +32,6 @@ from com.vmware.content.library.item.updatesession_client import File as UpdateS
 from samples.vsphere.common.id_generator import generate_random_uuid
 from samples.vsphere.common.vim.helpers.get_datastore_by_name import get_datastore_id
 
-__author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
-
 
 class ClsApiHelper(object):
     """
diff --git a/samples/vsphere/contentlibrary/lib/cls_sync_helper.py b/samples/vsphere/contentlibrary/lib/cls_sync_helper.py
index ee237b97..f9edf062 100644
--- a/samples/vsphere/contentlibrary/lib/cls_sync_helper.py
+++ b/samples/vsphere/contentlibrary/lib/cls_sync_helper.py
@@ -1,10 +1,21 @@
-import time
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
 
 __author__ = 'VMware, Inc.'
 __copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
 
+import time
 
-class ClsSyncHelper():
+class ClsSyncHelper:
     """
     Helper class to wait for the subscribed libraries and items to be
     synchronized completely with the publisher.
diff --git a/samples/vsphere/contentlibrary/ovfdeploy/deploy_ovf_template.py b/samples/vsphere/contentlibrary/ovfdeploy/deploy_ovf_template.py
index 05591721..bd53057f 100644
--- a/samples/vsphere/contentlibrary/ovfdeploy/deploy_ovf_template.py
+++ b/samples/vsphere/contentlibrary/ovfdeploy/deploy_ovf_template.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
+
 try:
     import urllib2
 except ImportError:
@@ -28,8 +31,6 @@ from samples.vsphere.common.vim.helpers.vim_utils import (
 from samples.vsphere.contentlibrary.lib.cls_api_client import ClsApiClient
 from samples.vsphere.contentlibrary.lib.cls_api_helper import ClsApiHelper
 
-__author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
 
 
 class DeployOvfTemplate(SampleBase):
diff --git a/samples/vsphere/contentlibrary/ovfimport/ovf_import_export.py b/samples/vsphere/contentlibrary/ovfimport/ovf_import_export.py
index 1cae5b35..7e340bfd 100644
--- a/samples/vsphere/contentlibrary/ovfimport/ovf_import_export.py
+++ b/samples/vsphere/contentlibrary/ovfimport/ovf_import_export.py
@@ -13,6 +13,9 @@
 """
 
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
+
 import tempfile
 try:
     import urllib2
@@ -28,10 +31,6 @@ from samples.vsphere.contentlibrary.lib.cls_api_helper import ClsApiHelper
 from samples.vsphere.common.vim.helpers.get_datastore_by_name import get_datastore_id
 
 
-__author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
-
-
 class OvfImportExport(SampleBase):
     """
     Demonstrates the workflow to import an OVF package into the content library,
diff --git a/samples/vsphere/contentlibrary/publishsubscribe/library_publish_subscribe.py b/samples/vsphere/contentlibrary/publishsubscribe/library_publish_subscribe.py
index cf27e86a..51eadece 100644
--- a/samples/vsphere/contentlibrary/publishsubscribe/library_publish_subscribe.py
+++ b/samples/vsphere/contentlibrary/publishsubscribe/library_publish_subscribe.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
+
 try:
     import urllib2
 except ImportError:
@@ -26,9 +29,6 @@ from samples.vsphere.contentlibrary.lib.cls_api_client import ClsApiClient
 from samples.vsphere.contentlibrary.lib.cls_api_helper import ClsApiHelper
 from samples.vsphere.contentlibrary.lib.cls_sync_helper import ClsSyncHelper
 
-__author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
-
 
 class LibraryPublishSubscribe(SampleBase):
     """
@@ -174,7 +174,7 @@ class LibraryPublishSubscribe(SampleBase):
         self.sub_lib_id = self.client.subscribed_library_service.create(
             create_spec=sub_spec, client_token=generate_random_uuid())
         sub_lib = self.client.subscribed_library_service.get(self.sub_lib_id)
-        return (sub_lib, sub_spec)
+        return sub_lib, sub_spec
 
     def _cleanup(self):
         if self.sub_lib_id:
diff --git a/samples/vsphere/contentlibrary/vmcapture/__init__.py b/samples/vsphere/contentlibrary/vmcapture/__init__.py
index 0e0d0aa3..ecb4de9e 100644
--- a/samples/vsphere/contentlibrary/vmcapture/__init__.py
+++ b/samples/vsphere/contentlibrary/vmcapture/__init__.py
@@ -12,7 +12,7 @@
 
 
 __author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
 
 
 # Required to distribute different parts of this
diff --git a/samples/vsphere/contentlibrary/vmcapture/vm_template_capture.py b/samples/vsphere/contentlibrary/vmcapture/vm_template_capture.py
index d52e75ab..c18a67b0 100644
--- a/samples/vsphere/contentlibrary/vmcapture/vm_template_capture.py
+++ b/samples/vsphere/contentlibrary/vmcapture/vm_template_capture.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 try:
     import urllib2
 except ImportError:
@@ -24,8 +27,6 @@ from samples.vsphere.contentlibrary.lib.cls_api_helper import ClsApiHelper
 
 from samples.vsphere.vcenter.helper.vm_helper import get_vm
 
-__author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
 
 
 class CaptureVMTemplateToContentLibrary(SampleBase):
diff --git a/samples/vsphere/sso/__init__.py b/samples/vsphere/sso/__init__.py
index 1b821c35..79706080 100644
--- a/samples/vsphere/sso/__init__.py
+++ b/samples/vsphere/sso/__init__.py
@@ -1,3 +1,18 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 # Required to distribute different parts of this
 # package as multiple distribution
 try:
diff --git a/samples/vsphere/tagging/__init__.py b/samples/vsphere/tagging/__init__.py
index 0e0d0aa3..ecb4de9e 100644
--- a/samples/vsphere/tagging/__init__.py
+++ b/samples/vsphere/tagging/__init__.py
@@ -12,7 +12,7 @@
 
 
 __author__ = 'VMware, Inc.'
-__copyright__ = 'Copyright 2016 VMware, Inc.  All rights reserved.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
 
 
 # Required to distribute different parts of this
diff --git a/samples/vsphere/vcenter/__init__.py b/samples/vsphere/vcenter/__init__.py
index e69de29b..0613959c 100644
--- a/samples/vsphere/vcenter/__init__.py
+++ b/samples/vsphere/vcenter/__init__.py
@@ -0,0 +1,24 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
+# Required to distribute different parts of this
+# package as multiple distribution
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vsphere/vcenter/helper/__init__.py b/samples/vsphere/vcenter/helper/__init__.py
index 1b821c35..0613959c 100644
--- a/samples/vsphere/vcenter/helper/__init__.py
+++ b/samples/vsphere/vcenter/helper/__init__.py
@@ -1,3 +1,19 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 # Required to distribute different parts of this
 # package as multiple distribution
 try:
@@ -5,4 +21,4 @@ try:
     pkg_resources.declare_namespace(__name__)
 except ImportError:
     from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
\ No newline at end of file
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vsphere/vcenter/helper/cluster_helper.py b/samples/vsphere/vcenter/helper/cluster_helper.py
index 47937570..da229a9e 100644
--- a/samples/vsphere/vcenter/helper/cluster_helper.py
+++ b/samples/vsphere/vcenter/helper/cluster_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter_client import Cluster
 
 from samples.vsphere.vcenter.helper import datacenter_helper
diff --git a/samples/vsphere/vcenter/helper/datacenter_helper.py b/samples/vsphere/vcenter/helper/datacenter_helper.py
index 96277c08..542898fc 100644
--- a/samples/vsphere/vcenter/helper/datacenter_helper.py
+++ b/samples/vsphere/vcenter/helper/datacenter_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter_client import Datacenter
 
 
diff --git a/samples/vsphere/vcenter/helper/datastore_helper.py b/samples/vsphere/vcenter/helper/datastore_helper.py
index b4ade49c..e76219f8 100644
--- a/samples/vsphere/vcenter/helper/datastore_helper.py
+++ b/samples/vsphere/vcenter/helper/datastore_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter_client import Datastore
 
 from samples.vsphere.vcenter.helper import datacenter_helper
diff --git a/samples/vsphere/vcenter/helper/folder_helper.py b/samples/vsphere/vcenter/helper/folder_helper.py
index 1a675278..2cb14907 100644
--- a/samples/vsphere/vcenter/helper/folder_helper.py
+++ b/samples/vsphere/vcenter/helper/folder_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter_client import Folder
 
 from samples.vsphere.vcenter.helper import datacenter_helper
diff --git a/samples/vsphere/vcenter/helper/network_helper.py b/samples/vsphere/vcenter/helper/network_helper.py
index 0fd7b7d4..22811b02 100644
--- a/samples/vsphere/vcenter/helper/network_helper.py
+++ b/samples/vsphere/vcenter/helper/network_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter_client import Network
 
 from samples.vsphere.vcenter.helper import datacenter_helper
diff --git a/samples/vsphere/vcenter/helper/resource_pool_helper.py b/samples/vsphere/vcenter/helper/resource_pool_helper.py
index 9481be72..b449b65b 100644
--- a/samples/vsphere/vcenter/helper/resource_pool_helper.py
+++ b/samples/vsphere/vcenter/helper/resource_pool_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter_client import ResourcePool
 
 from samples.vsphere.vcenter.helper import datacenter_helper
diff --git a/samples/vsphere/vcenter/helper/vm_helper.py b/samples/vsphere/vcenter/helper/vm_helper.py
index 8448ea61..e7f4bdc7 100644
--- a/samples/vsphere/vcenter/helper/vm_helper.py
+++ b/samples/vsphere/vcenter/helper/vm_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter_client import VM
 
 
diff --git a/samples/vsphere/vcenter/helper/vm_placement_helper.py b/samples/vsphere/vcenter/helper/vm_placement_helper.py
index d6a9b4dc..5d6a9539 100644
--- a/samples/vsphere/vcenter/helper/vm_placement_helper.py
+++ b/samples/vsphere/vcenter/helper/vm_placement_helper.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter_client import VM
 
 from samples.vsphere.vcenter.helper import datastore_helper
diff --git a/samples/vsphere/vcenter/setup/__init__.py b/samples/vsphere/vcenter/setup/__init__.py
index 1b821c35..0613959c 100644
--- a/samples/vsphere/vcenter/setup/__init__.py
+++ b/samples/vsphere/vcenter/setup/__init__.py
@@ -1,3 +1,19 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 # Required to distribute different parts of this
 # package as multiple distribution
 try:
@@ -5,4 +21,4 @@ try:
     pkg_resources.declare_namespace(__name__)
 except ImportError:
     from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
\ No newline at end of file
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vsphere/vcenter/setup/backend_directory.py b/samples/vsphere/vcenter/setup/backend_directory.py
index a8600d04..066e0d19 100644
--- a/samples/vsphere/vcenter/setup/backend_directory.py
+++ b/samples/vsphere/vcenter/setup/backend_directory.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 from samples.vsphere.common.vim.file import (detect_directory,
                                              create_directory,
                                              delete_directory)
diff --git a/samples/vsphere/vcenter/setup/cluster.py b/samples/vsphere/vcenter/setup/cluster.py
index 033d2604..6819389e 100644
--- a/samples/vsphere/vcenter/setup/cluster.py
+++ b/samples/vsphere/vcenter/setup/cluster.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 import pyVim.task
 from com.vmware.vcenter_client import Cluster
 from pyVmomi import vim
diff --git a/samples/vsphere/vcenter/setup/datacenter.py b/samples/vsphere/vcenter/setup/datacenter.py
index 8c6befb8..bc430ca3 100644
--- a/samples/vsphere/vcenter/setup/datacenter.py
+++ b/samples/vsphere/vcenter/setup/datacenter.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 from com.vmware.vcenter_client import (Datacenter, Folder)
 
 
diff --git a/samples/vsphere/vcenter/setup/datastore.py b/samples/vsphere/vcenter/setup/datastore.py
index b177aa67..eb37e98f 100644
--- a/samples/vsphere/vcenter/setup/datastore.py
+++ b/samples/vsphere/vcenter/setup/datastore.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 import pyVim.task
 from com.vmware.vcenter_client import Host
 from pyVmomi import vim
diff --git a/samples/vsphere/vcenter/setup/floppy_image.py b/samples/vsphere/vcenter/setup/floppy_image.py
index 6aa5cee6..b70892e2 100644
--- a/samples/vsphere/vcenter/setup/floppy_image.py
+++ b/samples/vsphere/vcenter/setup/floppy_image.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 from samples.vsphere.common.vim.file import (detect_file, delete_file,
                                       parse_datastore_path)
 from samples.vsphere.common.vim.inventory import get_datastore_mo
diff --git a/samples/vsphere/vcenter/setup/folder.py b/samples/vsphere/vcenter/setup/folder.py
index dbe563c3..77ab3235 100644
--- a/samples/vsphere/vcenter/setup/folder.py
+++ b/samples/vsphere/vcenter/setup/folder.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 import pyVim.task
 from com.vmware.vcenter_client import (Folder)
 from pyVmomi import vim
diff --git a/samples/vsphere/vcenter/setup/host.py b/samples/vsphere/vcenter/setup/host.py
index b253cca0..c9e4169a 100644
--- a/samples/vsphere/vcenter/setup/host.py
+++ b/samples/vsphere/vcenter/setup/host.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 import pyVim.task
 from com.vmware.vcenter_client import (Folder, Host)
 from pyVmomi import vim
diff --git a/samples/vsphere/vcenter/setup/iso_image.py b/samples/vsphere/vcenter/setup/iso_image.py
index d54238bf..73bd4024 100644
--- a/samples/vsphere/vcenter/setup/iso_image.py
+++ b/samples/vsphere/vcenter/setup/iso_image.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 from samples.vsphere.common.vim.file import (detect_file, delete_file,
                                       parse_datastore_path)
 from samples.vsphere.common.vim.inventory import get_datastore_mo
diff --git a/samples/vsphere/vcenter/setup/main.py b/samples/vsphere/vcenter/setup/main.py
index 828172ec..30e0b3bb 100644
--- a/samples/vsphere/vcenter/setup/main.py
+++ b/samples/vsphere/vcenter/setup/main.py
@@ -17,6 +17,10 @@
 Script that runs through all the setup and samples.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 import pyVim.connect
 from samples.vsphere.common import sample_util
 from samples.vsphere.common import vapiconnect
diff --git a/samples/vsphere/vcenter/setup/network.py b/samples/vsphere/vcenter/setup/network.py
index 1bef8d8b..377f1dcd 100644
--- a/samples/vsphere/vcenter/setup/network.py
+++ b/samples/vsphere/vcenter/setup/network.py
@@ -10,6 +10,10 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 import pyVim.task
 from com.vmware.vcenter_client import Host
 from pyVmomi import vim
diff --git a/samples/vsphere/vcenter/setup/setup_cli.py b/samples/vsphere/vcenter/setup/setup_cli.py
index 43929edf..d673299d 100644
--- a/samples/vsphere/vcenter/setup/setup_cli.py
+++ b/samples/vsphere/vcenter/setup/setup_cli.py
@@ -13,6 +13,11 @@
 """
 This module implements simple helper functions for python samples
 """
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 import argparse
 
 
diff --git a/samples/vsphere/vcenter/setup/testbed.py b/samples/vsphere/vcenter/setup/testbed.py
index 5be66c11..ab56850f 100644
--- a/samples/vsphere/vcenter/setup/testbed.py
+++ b/samples/vsphere/vcenter/setup/testbed.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 """
 * *******************************************************
 * Copyright (c) VMware, Inc. 2016. All Rights Reserved.
@@ -12,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 config = {}
 config["SERVER"] = ""
 config["USERNAME"] = "administrator@vsphere.local"
@@ -95,7 +96,7 @@ class Testbed(object):
 
     @config.setter
     def config(self, value):
-        'setting'
+        """setting"""
         self._config = value
 
     @property
@@ -104,7 +105,7 @@ class Testbed(object):
 
     @entities.setter
     def entities(self, value):
-        'setting'
+        """setting"""
         self._entities = value
 
     def to_config_string(self):
diff --git a/samples/vsphere/vcenter/setup/testbed_setup.py b/samples/vsphere/vcenter/setup/testbed_setup.py
index f7c0ef01..714969b8 100644
--- a/samples/vsphere/vcenter/setup/testbed_setup.py
+++ b/samples/vsphere/vcenter/setup/testbed_setup.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import samples.vsphere.vcenter.setup.backend_directory as backend_directory
 import samples.vsphere.vcenter.setup.cluster as cluster
 import samples.vsphere.vcenter.setup.datacenter as datacenter
diff --git a/samples/vsphere/vcenter/vm/__init__.py b/samples/vsphere/vcenter/vm/__init__.py
index e69de29b..0613959c 100644
--- a/samples/vsphere/vcenter/vm/__init__.py
+++ b/samples/vsphere/vcenter/vm/__init__.py
@@ -0,0 +1,24 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
+# Required to distribute different parts of this
+# package as multiple distribution
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vsphere/vcenter/vm/create/__init__.py b/samples/vsphere/vcenter/vm/create/__init__.py
index 1b821c35..0613959c 100644
--- a/samples/vsphere/vcenter/vm/create/__init__.py
+++ b/samples/vsphere/vcenter/vm/create/__init__.py
@@ -1,3 +1,19 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
 # Required to distribute different parts of this
 # package as multiple distribution
 try:
@@ -5,4 +21,4 @@ try:
     pkg_resources.declare_namespace(__name__)
 except ImportError:
     from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
\ No newline at end of file
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vsphere/vcenter/vm/create/create_basic_vm.py b/samples/vsphere/vcenter/vm/create/create_basic_vm.py
index d4195901..767dbaa8 100644
--- a/samples/vsphere/vcenter/vm/create/create_basic_vm.py
+++ b/samples/vsphere/vcenter/vm/create/create_basic_vm.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware.boot_client import Device as BootDevice
 from com.vmware.vcenter.vm.hardware_client import (
     Disk, Ethernet)
diff --git a/samples/vsphere/vcenter/vm/create/create_default_vm.py b/samples/vsphere/vcenter/vm/create/create_default_vm.py
index 0fd5c38c..c4677cb3 100644
--- a/samples/vsphere/vcenter/vm/create/create_default_vm.py
+++ b/samples/vsphere/vcenter/vm/create/create_default_vm.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm_client import Power
 from com.vmware.vcenter_client import VM
 from samples.vsphere.common import vapiconnect
diff --git a/samples/vsphere/vcenter/vm/create/create_exhaustive_vm.py b/samples/vsphere/vcenter/vm/create/create_exhaustive_vm.py
index a3ca0f5a..24e19590 100644
--- a/samples/vsphere/vcenter/vm/create/create_exhaustive_vm.py
+++ b/samples/vsphere/vcenter/vm/create/create_exhaustive_vm.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware.boot_client import Device as BootDevice
 from com.vmware.vcenter.vm.hardware_client import (
     Cpu, Memory, Disk, Ethernet, Cdrom, Serial, Parallel, Floppy, Boot)
diff --git a/samples/vsphere/vcenter/vm/hardware/__init__.py b/samples/vsphere/vcenter/vm/hardware/__init__.py
index e69de29b..0613959c 100644
--- a/samples/vsphere/vcenter/vm/hardware/__init__.py
+++ b/samples/vsphere/vcenter/vm/hardware/__init__.py
@@ -0,0 +1,24 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
+# Required to distribute different parts of this
+# package as multiple distribution
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vsphere/vcenter/vm/hardware/adapter/__init__.py b/samples/vsphere/vcenter/vm/hardware/adapter/__init__.py
index e69de29b..0613959c 100644
--- a/samples/vsphere/vcenter/vm/hardware/adapter/__init__.py
+++ b/samples/vsphere/vcenter/vm/hardware/adapter/__init__.py
@@ -0,0 +1,24 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2016. All Rights Reserved.
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
+
+# Required to distribute different parts of this
+# package as multiple distribution
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vsphere/vcenter/vm/hardware/adapter/sata.py b/samples/vsphere/vcenter/vm/hardware/adapter/sata.py
index b3be2c67..b9512950 100644
--- a/samples/vsphere/vcenter/vm/hardware/adapter/sata.py
+++ b/samples/vsphere/vcenter/vm/hardware/adapter/sata.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware.adapter_client import Sata
 from samples.vsphere.common import vapiconnect
 from samples.vsphere.common.sample_util import pp, \
diff --git a/samples/vsphere/vcenter/vm/hardware/adapter/scsi.py b/samples/vsphere/vcenter/vm/hardware/adapter/scsi.py
index 2627c248..2e7a1533 100644
--- a/samples/vsphere/vcenter/vm/hardware/adapter/scsi.py
+++ b/samples/vsphere/vcenter/vm/hardware/adapter/scsi.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware.adapter_client import Scsi
 from samples.vsphere.common import vapiconnect
 from samples.vsphere.common.sample_util import pp, \
diff --git a/samples/vsphere/vcenter/vm/hardware/boot.py b/samples/vsphere/vcenter/vm/hardware/boot.py
index 1b6ed990..eb3a9627 100644
--- a/samples/vsphere/vcenter/vm/hardware/boot.py
+++ b/samples/vsphere/vcenter/vm/hardware/boot.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware_client import Boot
 from samples.vsphere.common import vapiconnect
 from samples.vsphere.common.sample_util import parse_cli_args_vm
diff --git a/samples/vsphere/vcenter/vm/hardware/boot_device.py b/samples/vsphere/vcenter/vm/hardware/boot_device.py
index ca4b26ff..c2ef34ec 100644
--- a/samples/vsphere/vcenter/vm/hardware/boot_device.py
+++ b/samples/vsphere/vcenter/vm/hardware/boot_device.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware.boot_client import Device as BootDevice
 from com.vmware.vcenter.vm.hardware_client import (Disk, Ethernet)
 from samples.vsphere.common import vapiconnect
diff --git a/samples/vsphere/vcenter/vm/hardware/cdrom.py b/samples/vsphere/vcenter/vm/hardware/cdrom.py
index 9d0ca7a1..480a515a 100644
--- a/samples/vsphere/vcenter/vm/hardware/cdrom.py
+++ b/samples/vsphere/vcenter/vm/hardware/cdrom.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware.adapter_client import Sata
 from com.vmware.vcenter.vm.hardware_client import (Cdrom,
                                                    IdeAddressSpec,
diff --git a/samples/vsphere/vcenter/vm/hardware/cpu.py b/samples/vsphere/vcenter/vm/hardware/cpu.py
index 7fdc4a38..859b59b7 100644
--- a/samples/vsphere/vcenter/vm/hardware/cpu.py
+++ b/samples/vsphere/vcenter/vm/hardware/cpu.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware_client import Cpu
 from samples.vsphere.common import vapiconnect
 from samples.vsphere.common.sample_util import parse_cli_args_vm
diff --git a/samples/vsphere/vcenter/vm/hardware/disk.py b/samples/vsphere/vcenter/vm/hardware/disk.py
index d9889b6c..faed3360 100644
--- a/samples/vsphere/vcenter/vm/hardware/disk.py
+++ b/samples/vsphere/vcenter/vm/hardware/disk.py
@@ -11,6 +11,10 @@
 * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import atexit
 
 from com.vmware.vcenter.vm.hardware.adapter_client import Sata
diff --git a/samples/vsphere/vcenter/vm/hardware/ethernet.py b/samples/vsphere/vcenter/vm/hardware/ethernet.py
index f364cb24..18db864a 100644
--- a/samples/vsphere/vcenter/vm/hardware/ethernet.py
+++ b/samples/vsphere/vcenter/vm/hardware/ethernet.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware_client import Ethernet
 from com.vmware.vcenter.vm_client import Power
 from samples.vsphere.common import vapiconnect
diff --git a/samples/vsphere/vcenter/vm/hardware/floppy.py b/samples/vsphere/vcenter/vm/hardware/floppy.py
index ebf9c176..2d3d3449 100644
--- a/samples/vsphere/vcenter/vm/hardware/floppy.py
+++ b/samples/vsphere/vcenter/vm/hardware/floppy.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware_client import Floppy
 from com.vmware.vcenter.vm_client import Power
 from samples.vsphere.common import vapiconnect
diff --git a/samples/vsphere/vcenter/vm/hardware/main.py b/samples/vsphere/vcenter/vm/hardware/main.py
index 7e25393e..d789eac8 100644
--- a/samples/vsphere/vcenter/vm/hardware/main.py
+++ b/samples/vsphere/vcenter/vm/hardware/main.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import samples.vsphere.vcenter.vm.hardware.adapter.sata
 import samples.vsphere.vcenter.vm.hardware.adapter.scsi
 import samples.vsphere.vcenter.vm.hardware.boot
diff --git a/samples/vsphere/vcenter/vm/hardware/memory.py b/samples/vsphere/vcenter/vm/hardware/memory.py
index 97105c31..7d599635 100644
--- a/samples/vsphere/vcenter/vm/hardware/memory.py
+++ b/samples/vsphere/vcenter/vm/hardware/memory.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware_client import Memory
 from samples.vsphere.common import vapiconnect
 from samples.vsphere.common.sample_util import parse_cli_args_vm
diff --git a/samples/vsphere/vcenter/vm/hardware/parallel.py b/samples/vsphere/vcenter/vm/hardware/parallel.py
index a12f8efe..443ae378 100644
--- a/samples/vsphere/vcenter/vm/hardware/parallel.py
+++ b/samples/vsphere/vcenter/vm/hardware/parallel.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware_client import Parallel
 from com.vmware.vcenter.vm_client import Power
 from pyVim.connect import SmartConnect, Disconnect
diff --git a/samples/vsphere/vcenter/vm/hardware/serial.py b/samples/vsphere/vcenter/vm/hardware/serial.py
index 514b1571..d758b29c 100644
--- a/samples/vsphere/vcenter/vm/hardware/serial.py
+++ b/samples/vsphere/vcenter/vm/hardware/serial.py
@@ -12,6 +12,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter.vm.hardware_client import Serial
 from com.vmware.vcenter.vm_client import Power
 from pyVim.connect import SmartConnect, Disconnect
diff --git a/samples/vsphere/vcenter/vm/main.py b/samples/vsphere/vcenter/vm/main.py
index b2cc80af..1ab85c3d 100644
--- a/samples/vsphere/vcenter/vm/main.py
+++ b/samples/vsphere/vcenter/vm/main.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import samples.vsphere.vcenter.helper.network_helper
 import samples.vsphere.vcenter.vm.hardware.main
 import samples.vsphere.vcenter.vm.placement
diff --git a/samples/vsphere/vcenter/vm/placement.py b/samples/vsphere/vcenter/vm/placement.py
index f96e270e..553c8df3 100644
--- a/samples/vsphere/vcenter/vm/placement.py
+++ b/samples/vsphere/vcenter/vm/placement.py
@@ -10,6 +10,9 @@
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
 
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 from com.vmware.vcenter_client import (Cluster, Datastore, Folder, ResourcePool,
                                        VM)
 
diff --git a/samples/vsphere/vcenter/vm/power.py b/samples/vsphere/vcenter/vm/power.py
index b63454f8..5867d95f 100644
--- a/samples/vsphere/vcenter/vm/power.py
+++ b/samples/vsphere/vcenter/vm/power.py
@@ -11,6 +11,10 @@
 * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
 * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
 """
+
+__author__ = 'VMware, Inc.'
+__copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
+
 import atexit
 
 from com.vmware.vcenter.vm_client import Power