diff --git a/azure-cli.pyproj b/azure-cli.pyproj
index 12642ec17..9ce4c7740 100644
--- a/azure-cli.pyproj
+++ b/azure-cli.pyproj
@@ -55,6 +55,9 @@
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\resource_management_client.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\version.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\__init__.py">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\test_api_check.py">
       <SubType>Code</SubType>
     </Compile>
@@ -147,9 +150,7 @@
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\" />
-    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\operations\" />
-    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\operations\__pycache__\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\recordings\" />
     <Folder Include="command_modules\azure-cli-profile\" />
@@ -200,19 +201,6 @@
   <ItemGroup>
     <Content Include="command_modules\azure-cli-component\requirements.txt" />
     <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\azuredeploy.json" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\basic_dependency.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\dependency.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\deployment_extended.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\deployment_properties_extended.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\deployment_vnet.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\parameters_link.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\provider.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\provider_resource_type.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\resource_management_client_enums.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\template_link.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\models\__pycache__\__init__.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\operations\__pycache__\vnet_operations.cpython-35.pyc" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\lib\operations\__pycache__\__init__.cpython-35.pyc" />
     <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt\swagger_create_vnet.json" />
     <Content Include="command_modules\azure-cli-network\requirements.txt" />
     <Content Include="command_modules\azure-cli-profile\requirements.txt" />
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py
index a90eddbff..850430a4c 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py
@@ -250,13 +250,13 @@ build_operation("network vnet",
 @command_table.description(L('Create a new virtual network.'))
 @command_table.option('--resource-group -g', help=L('the the resource group name'), required=True)
 @command_table.option('--virtualNetworkPrefix',
-        help=L('IP address prefix for the virtual network.'))
+                      help=L('IP address prefix for the virtual network.'))
 @command_table.option('--subnetName',
-        help=L('Name of the subnet.'))
+                      help=L('Name of the subnet.'))
 @command_table.option('--subnetPrefix',
-        help=L('IP address for the subnet.'))
+                      help=L('IP address for the subnet.'))
 @command_table.option('--virtualNetworkName',
-        help=L('Name of the virtual network.'), required=True)
+                      help=L('Name of the virtual network.'), required=True)
 def create_vnet(args):
     from azure.cli.command_modules.network.mgmt.lib import ResourceManagementClient, ResourceManagementClientConfiguration
 
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/__init__.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/__init__.py
new file mode 100644
index 000000000..680e627fa
--- /dev/null
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/__init__.py
@@ -0,0 +1,3 @@
+#pylint: skip-file 
+import pkg_resources
+pkg_resources.declare_namespace(__name__)
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/__init__.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/__init__.py
index 32550415c..41bd78dc3 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/__init__.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/__init__.py
@@ -1,3 +1,4 @@
+#pylint: skip-file
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/credentials.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/credentials.py
index 50df87656..6467a597a 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/credentials.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/credentials.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/exceptions.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/exceptions.py
index 6d60160b6..bd522175e 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/exceptions.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/exceptions.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/__init__.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/__init__.py
index 282556630..518be52ea 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/__init__.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/__init__.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/basic_dependency.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/basic_dependency.py
index d7ce4fa40..d6e1c8c82 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/basic_dependency.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/basic_dependency.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/dependency.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/dependency.py
index 17d42d5ed..26c56f7b7 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/dependency.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/dependency.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_extended.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_extended.py
index 88c3bbe2f..58327413e 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_extended.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_extended.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_properties_extended.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_properties_extended.py
index 2adfcf895..56c83a80a 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_properties_extended.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_properties_extended.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_vnet.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_vnet.py
index 2cc5be10f..ccead6bee 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_vnet.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_vnet.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/parameters_link.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/parameters_link.py
index 610db4ce0..36e209152 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/parameters_link.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/parameters_link.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/provider.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/provider.py
index 7bb0acfbe..6e2c509c9 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/provider.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/provider.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/provider_resource_type.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/provider_resource_type.py
index c34de488a..313fa9a7a 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/provider_resource_type.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/provider_resource_type.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/resource_management_client_enums.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/resource_management_client_enums.py
index c64dc8b10..e4d04c133 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/resource_management_client_enums.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/resource_management_client_enums.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/template_link.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/template_link.py
index 1dbbe0c7e..477006627 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/template_link.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/template_link.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/operations/__init__.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/operations/__init__.py
index 91814fd5e..be55e7204 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/operations/__init__.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/operations/__init__.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/operations/vnet_operations.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/operations/vnet_operations.py
index 057ed8a5a..3eacc5422 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/operations/vnet_operations.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/operations/vnet_operations.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/resource_management_client.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/resource_management_client.py
index 1dcbd3aa0..2ff908b90 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/resource_management_client.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/resource_management_client.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/version.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/version.py
index f3dfb639f..f2bddae9b 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/version.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/version.py
@@ -1,3 +1,4 @@
+#pylint: skip-file 
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator 0.15.0.0