diff --git a/.hgeol b/.hgeol
deleted file mode 100644
index 67aa696c7f..0000000000
--- a/.hgeol
+++ /dev/null
@@ -1,21 +0,0 @@
-[patterns]
-
-**.sln  = BIN
-**.ico  = BIN
-**.bmp  = BIN
-**.png  = BIN
-**.snk  = BIN
-**.mht  = BIN
-**.pickle  = BIN
-
-# Some Windows-specific files should always be CRLF
-
-**.bat  = CRLF
-
-# All other files (which presumably are human-editable) are "native".
-# This must be the last rule!
-
-** = native
-
-[repository]
-native = LF
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 0000000000..8191b7f190
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,9 @@
+Contribute Code
+===================================
+
+This project has adopted the `Microsoft Open Source Code of Conduct <https://opensource.microsoft.com/codeofconduct/>`__.
+
+For more information see the `Code of Conduct FAQ <https://opensource.microsoft.com/codeofconduct/faq/>`__ or contact `opencode@microsoft.com <mailto:opencode@microsoft.com>`__ with any additional questions or comments.
+
+If you would like to become an active contributor to this project please
+follow the instructions provided in `Microsoft Azure Projects Contribution Guidelines <http://azure.github.io/guidelines.html>`__
diff --git a/Dockerfile b/Dockerfile
index fb0fe9342c..daec135285 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 FROM python:3.5
 
 # Set the working directory
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000000..5553f753ea
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,13 @@
+Azure CLI
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved. 
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.rst b/README.rst
index 2d0609759a..f9bd249b0d 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,11 @@
 Microsoft Project AZ - Preview
 ==================================
 
+.. image:: https://travis-ci.com/Azure/azure-cli.svg?branch=master
+    :target: https://travis-ci.com/Azure/azure-cli
+
+==================================
+
 A great cloud needs great tools; we're excited to introduce *Project Az*, our prototype for building a great, multiplatform commandline experience for Azure.
 
 Project Az is built on Python (2.7, 3.4 and 3.5).
@@ -11,15 +16,15 @@ Installation
 For installation steps for common platforms, please take a look at our `preview installation guide <http://github.com/Azure/azure-cli/blob/master/doc/preview_install_guide.md>`__.
 
 Docker Setup (optional)
-------------
+-----------------------
 We have automated Docker images of the latest code in the master branch.
 
-If you have not previously done so, configure your Docker client engine [here](https://docs.docker.com/engine/installation/).
+If you have not previously done so, `configure your Docker client engine <https://docs.docker.com/engine/installation/>`__.
 
 Then:
-+ Run `docker login` (contact the team for credentials as the images are not public yet).
-+ Run `docker pull azuresdk/azure-cli-python:latest`
-+ Run `docker run -it azuresdk/azure-cli-python:latest`
+ + Run :code:`docker login` (contact the team for credentials as the images are not public yet).
+ + Run :code:`docker pull azuresdk/azure-cli-python:latest`
+ + Run :code:`docker run -it azuresdk/azure-cli-python:latest`
 
 Usage
 =====
@@ -31,7 +36,7 @@ Usage
 For sample scripts and commands, please visit the `Demo Scripts <https://github.com/Azure/azure-cli/blob/master/doc/preview_demo_scripts.md>`__ page.  
 
 Download Source Code
---------------------
+====================
 
 To get the source code of the SDK via **git** type
 
@@ -51,7 +56,9 @@ To provide feedback from the command line, try the ``az feedback`` command.
 Contribute Code
 ===================================
 
-This project has adopted the `Microsoft Open Source Code of Conduct <https://opensource.microsoft.com/codeofconduct/>`__. For more information see the `Code of Conduct FAQ <https://opensource.microsoft.com/codeofconduct/faq/>`__ or contact `opencode@microsoft.com <mailto:opencode@microsoft.com>`__ with any additional questions or comments.
+This project has adopted the `Microsoft Open Source Code of Conduct <https://opensource.microsoft.com/codeofconduct/>`__.
+
+For more information see the `Code of Conduct FAQ <https://opensource.microsoft.com/codeofconduct/faq/>`__ or contact `opencode@microsoft.com <mailto:opencode@microsoft.com>`__ with any additional questions or comments.
 
 If you would like to become an active contributor to this project please
 follow the instructions provided in `Microsoft Azure Projects Contribution Guidelines <http://azure.github.io/guidelines.html>`__
@@ -60,3 +67,8 @@ Learn More
 ==========
 
 `Microsoft Azure Python Developer Center <http://azure.microsoft.com/en-us/develop/python/>`__
+
+License
+=======
+
+`MIT <https://github.com/Azure/azure-cli/blob/master/LICENSE.txt>`__
diff --git a/doc/authoring_command_modules/example_module_template/setup.py b/doc/authoring_command_modules/example_module_template/setup.py
index 1cfd421fcd..64af62cc72 100644
--- a/doc/authoring_command_modules/example_module_template/setup.py
+++ b/doc/authoring_command_modules/example_module_template/setup.py
@@ -28,7 +28,7 @@ setup(
     version='0.0.1',
     description='Microsoft Azure Command-Line Tools Example Command Module',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Example Author',
     author_email='author@example.com',
     url='https://github.com/example/repo',
diff --git a/doc/preview_instructions.md b/doc/preview_instructions.md
index c42586442c..f441b7db56 100644
--- a/doc/preview_instructions.md
+++ b/doc/preview_instructions.md
@@ -8,11 +8,11 @@ Installation via CURL
 
 To install via cURL on Linux, Unix and OS X, type:
 
-    curl http://azure-cli-nightly.westus.cloudapp.azure.com/install | bash
+    curl -L https://aka.ms/ProjectAzInstall | bash
 
 If you chose to enable tab completion, type `exec -l $SHELL` to restart your shell.
 
-Note: This will install the latest nightly builds.  You may re-run this script later to safely update to the latest version.
+Note: This will install the latest verified nightly builds.  You may re-run this script later to safely update to the latest version.
 
 Example Demo Script
 -------------------
diff --git a/doc/sphinx/azhelpgen/azhelpgen.py b/doc/sphinx/azhelpgen/azhelpgen.py
index e9b28f887c..589dc9d064 100644
--- a/doc/sphinx/azhelpgen/azhelpgen.py
+++ b/doc/sphinx/azhelpgen/azhelpgen.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import argparse
 from docutils import nodes
 from docutils.statemachine import ViewList
diff --git a/scripts/command_coverage.py b/scripts/command_coverage.py
index e9ce2ac786..5ae7f51a72 100644
--- a/scripts/command_coverage.py
+++ b/scripts/command_coverage.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 import os
 import sys
diff --git a/scripts/command_modules/_common.py b/scripts/command_modules/_common.py
index a7a1ec5201..6de76d4e6c 100644
--- a/scripts/command_modules/_common.py
+++ b/scripts/command_modules/_common.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 import os
 import sys
diff --git a/scripts/command_modules/install.py b/scripts/command_modules/install.py
index 6b20fee167..1b1faa1823 100644
--- a/scripts/command_modules/install.py
+++ b/scripts/command_modules/install.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 ## Install the command modules using pip ##
 from __future__ import print_function
 import os
diff --git a/scripts/command_modules/package_verify.py b/scripts/command_modules/package_verify.py
index a7dd4cf489..8e6dd4ceee 100644
--- a/scripts/command_modules/package_verify.py
+++ b/scripts/command_modules/package_verify.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 ## Install the command modules using pip ##
 from __future__ import print_function
 import os
diff --git a/scripts/command_modules/pylint.py b/scripts/command_modules/pylint.py
index 105f01ba80..21ae7ab805 100644
--- a/scripts/command_modules/pylint.py
+++ b/scripts/command_modules/pylint.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 ## Runs pylint on the command modules ##
 from __future__ import print_function
 import os
diff --git a/scripts/command_modules/test.py b/scripts/command_modules/test.py
index 0b8f468acc..0f92b0702a 100644
--- a/scripts/command_modules/test.py
+++ b/scripts/command_modules/test.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 ## Run the tests for each command module ##
 
 from __future__ import print_function
diff --git a/scripts/dev_setup.py b/scripts/dev_setup.py
index 6029148241..7c8a22c39c 100644
--- a/scripts/dev_setup.py
+++ b/scripts/dev_setup.py
@@ -1,4 +1,10 @@
 #!/usr/bin/python
+
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 import sys
 from subprocess import check_call, CalledProcessError
diff --git a/scripts/dump_command_table.py b/scripts/dump_command_table.py
index 7d5329bddb..daeb0b240b 100644
--- a/scripts/dump_command_table.py
+++ b/scripts/dump_command_table.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 
 import argparse
diff --git a/scripts/generate_command_inventory.py b/scripts/generate_command_inventory.py
index 6710027c3e..492bb0a8ab 100644
--- a/scripts/generate_command_inventory.py
+++ b/scripts/generate_command_inventory.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import argparse
 import json
 import re
diff --git a/scripts/install/install b/scripts/install/install
index d72b428154..abe3b80920 100644
--- a/scripts/install/install
+++ b/scripts/install/install
@@ -1,4 +1,10 @@
 #!/usr/bin/env bash
+
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # 
 # Bash script to install the Azure CLI
 #
diff --git a/scripts/install/install.py b/scripts/install/install.py
index b927ae8025..99fb0d47cb 100644
--- a/scripts/install/install.py
+++ b/scripts/install/install.py
@@ -1,4 +1,10 @@
 #!/usr/bin/env python
+
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 #
 # This script will install the CLI into a directory and create an executable
 # at a specified file path that is the entry point into the CLI.
diff --git a/scripts/install/setup_completion.py b/scripts/install/setup_completion.py
index ebe27cba84..50e7d31b55 100644
--- a/scripts/install/setup_completion.py
+++ b/scripts/install/setup_completion.py
@@ -1,4 +1,10 @@
 #!/usr/bin/env python
+
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 #
 # This script will set up tab completion for the Azure CLI.
 #
diff --git a/lintall b/scripts/lintall
similarity index 100%
rename from lintall
rename to scripts/lintall
diff --git a/lintall.bat b/scripts/lintall.bat
similarity index 100%
rename from lintall.bat
rename to scripts/lintall.bat
diff --git a/scripts/sdk_command_gen/gen_command_module.py b/scripts/sdk_command_gen/gen_command_module.py
index 0435a6ba6b..438967b829 100644
--- a/scripts/sdk_command_gen/gen_command_module.py
+++ b/scripts/sdk_command_gen/gen_command_module.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 """
 Generate a command module using the SDK.
 """
@@ -79,7 +84,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/scripts/sdk_command_gen/gen_generated_file.py b/scripts/sdk_command_gen/gen_generated_file.py
index c0b1595bb5..7547653fd0 100644
--- a/scripts/sdk_command_gen/gen_generated_file.py
+++ b/scripts/sdk_command_gen/gen_generated_file.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 """
 Create the generated.py file for a command module.
 """
diff --git a/scripts/smart_create_gen/_common.py b/scripts/smart_create_gen/_common.py
index e774e63e8b..b2646e2957 100644
--- a/scripts/smart_create_gen/_common.py
+++ b/scripts/smart_create_gen/_common.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import configparser
 import os
 import re
diff --git a/scripts/smart_create_gen/generate_smart_create.py b/scripts/smart_create_gen/generate_smart_create.py
index e216589c42..d393fd64a0 100644
--- a/scripts/smart_create_gen/generate_smart_create.py
+++ b/scripts/smart_create_gen/generate_smart_create.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 
 import distutils
diff --git a/scripts/smart_create_gen/template_to_swagger.py b/scripts/smart_create_gen/template_to_swagger.py
index 4a868c4830..630ad8ce3d 100644
--- a/scripts/smart_create_gen/template_to_swagger.py
+++ b/scripts/smart_create_gen/template_to_swagger.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 
 from collections import OrderedDict
diff --git a/scripts/smart_create_gen/upload_arm_templates.py b/scripts/smart_create_gen/upload_arm_templates.py
index e7c3b15d19..695941d459 100644
--- a/scripts/smart_create_gen/upload_arm_templates.py
+++ b/scripts/smart_create_gen/upload_arm_templates.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 
 import json
diff --git a/scripts/smoke_test_install/_common.py b/scripts/smoke_test_install/_common.py
index 7caf843fd2..872fbdff2e 100644
--- a/scripts/smoke_test_install/_common.py
+++ b/scripts/smoke_test_install/_common.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import os
 import sys
 from six import StringIO, text_type, u
diff --git a/scripts/smoke_test_install/test_install_linux.py b/scripts/smoke_test_install/test_install_linux.py
index 44ccb351e3..f0cf87d0cc 100644
--- a/scripts/smoke_test_install/test_install_linux.py
+++ b/scripts/smoke_test_install/test_install_linux.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from _common import (create_vm,
                      install_cli_interactive,
                      verify_basic,
diff --git a/testall b/scripts/testall
similarity index 100%
rename from testall
rename to scripts/testall
diff --git a/testall.bat b/scripts/testall.bat
similarity index 100%
rename from testall.bat
rename to scripts/testall.bat
diff --git a/setup.py b/setup.py
index 32153ca0ba..559c1c2cee 100644
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,9 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from __future__ import print_function
 import os
@@ -48,8 +38,6 @@ else:
         print('Expected __version__ = "{}"; found "{}"'.format(VERSION, m.group(1)))
         sys.exit(1)
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -60,8 +48,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -114,7 +101,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/src/azure/cli/__init__.py b/src/azure/cli/__init__.py
index 2b6b0368c3..5fa7a53d96 100644
--- a/src/azure/cli/__init__.py
+++ b/src/azure/cli/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 '''The Azure Command-line tool.
 
 This tools provides a command-line interface to Azure's management and storage
diff --git a/src/azure/cli/__main__.py b/src/azure/cli/__main__.py
index 223ebf08e7..216cb314ae 100644
--- a/src/azure/cli/__main__.py
+++ b/src/azure/cli/__main__.py
@@ -1,4 +1,9 @@
-import sys
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+import sys
 import os
 
 import azure.cli.main
diff --git a/src/azure/cli/_azure_env.py b/src/azure/cli/_azure_env.py
index 9cc632da41..5ae49694fc 100644
--- a/src/azure/cli/_azure_env.py
+++ b/src/azure/cli/_azure_env.py
@@ -1,4 +1,9 @@
-CLIENT_ID = '04b07795-8ddb-461a-bbee-02f9e1bf7b46'
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+CLIENT_ID = '04b07795-8ddb-461a-bbee-02f9e1bf7b46'
 
 ENV_DEFAULT = 'AzureCloud'
 ENV_US_GOVERNMENT = 'AzureUSGovernment'
diff --git a/src/azure/cli/_debug.py b/src/azure/cli/_debug.py
index b99f940163..534fe4a63e 100644
--- a/src/azure/cli/_debug.py
+++ b/src/azure/cli/_debug.py
@@ -1,4 +1,9 @@
-import os
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+import os
 import azure.cli._logging as _logging
 
 logger = _logging.get_az_logger(__name__)
diff --git a/src/azure/cli/_help.py b/src/azure/cli/_help.py
index 62fe2e66a8..10849f2436 100644
--- a/src/azure/cli/_help.py
+++ b/src/azure/cli/_help.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 import argparse
 import sys
diff --git a/src/azure/cli/_logging.py b/src/azure/cli/_logging.py
index dca2a5445a..78e5d11881 100644
--- a/src/azure/cli/_logging.py
+++ b/src/azure/cli/_logging.py
@@ -1,4 +1,9 @@
-import os
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+import os
 import platform
 import logging
 from logging.handlers import RotatingFileHandler
diff --git a/src/azure/cli/_output.py b/src/azure/cli/_output.py
index 3a43d83a60..347f3c73d7 100644
--- a/src/azure/cli/_output.py
+++ b/src/azure/cli/_output.py
@@ -1,4 +1,9 @@
-from __future__ import print_function, unicode_literals
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from __future__ import print_function, unicode_literals
 
 import sys
 import json
diff --git a/src/azure/cli/_profile.py b/src/azure/cli/_profile.py
index 6d413ec208..0d65ec9676 100644
--- a/src/azure/cli/_profile.py
+++ b/src/azure/cli/_profile.py
@@ -1,4 +1,9 @@
-from __future__ import print_function
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from __future__ import print_function
 import collections
 from codecs import open as codecs_open
 import json
diff --git a/src/azure/cli/_session.py b/src/azure/cli/_session.py
index 60c2d32f18..68f08f98c3 100644
--- a/src/azure/cli/_session.py
+++ b/src/azure/cli/_session.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import json
 import os
 import time
diff --git a/src/azure/cli/_telemetry.py b/src/azure/cli/_telemetry.py
index e9ac41e427..b22ded67f9 100644
--- a/src/azure/cli/_telemetry.py
+++ b/src/azure/cli/_telemetry.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import getpass
 from applicationinsights import TelemetryClient
 from applicationinsights.exceptions import enable
diff --git a/src/azure/cli/_util.py b/src/azure/cli/_util.py
index d405c40aa1..dd0969c4f0 100644
--- a/src/azure/cli/_util.py
+++ b/src/azure/cli/_util.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 import sys
 import platform
diff --git a/src/azure/cli/adal_authentication.py b/src/azure/cli/adal_authentication.py
index 23030b7bb0..9ae45658aa 100644
--- a/src/azure/cli/adal_authentication.py
+++ b/src/azure/cli/adal_authentication.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import adal
 
 from msrest.authentication import Authentication
diff --git a/src/azure/cli/application.py b/src/azure/cli/application.py
index 446aa8a640..339e4e51f8 100644
--- a/src/azure/cli/application.py
+++ b/src/azure/cli/application.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from collections import defaultdict
 from datetime import datetime
 import sys
diff --git a/src/azure/cli/commands/__init__.py b/src/azure/cli/commands/__init__.py
index 7a6e731f20..656b8b3f8f 100644
--- a/src/azure/cli/commands/__init__.py
+++ b/src/azure/cli/commands/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 import json
 import time
diff --git a/src/azure/cli/commands/_introspection.py b/src/azure/cli/commands/_introspection.py
index 58d35d5487..aaa798bbf4 100644
--- a/src/azure/cli/commands/_introspection.py
+++ b/src/azure/cli/commands/_introspection.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import inspect
 import re
 
diff --git a/src/azure/cli/commands/arm.py b/src/azure/cli/commands/arm.py
index d6befa7e74..fcddbc26df 100644
--- a/src/azure/cli/commands/arm.py
+++ b/src/azure/cli/commands/arm.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import argparse
 import re
 from azure.cli.commands.client_factory import get_mgmt_service_client
diff --git a/src/azure/cli/commands/client_factory.py b/src/azure/cli/commands/client_factory.py
index e478d552fe..86ccefefd8 100644
--- a/src/azure/cli/commands/client_factory.py
+++ b/src/azure/cli/commands/client_factory.py
@@ -1,4 +1,9 @@
-from .._profile import Profile
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from .._profile import Profile
 import azure.cli._debug as _debug
 import azure.cli as cli
 import azure.cli._logging as _logging
diff --git a/src/azure/cli/commands/parameters.py b/src/azure/cli/commands/parameters.py
index dd9942c46f..da6a4a3487 100644
--- a/src/azure/cli/commands/parameters.py
+++ b/src/azure/cli/commands/parameters.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import argparse
 
 # pylint: disable=line-too-long
diff --git a/src/azure/cli/commands/template_create.py b/src/azure/cli/commands/template_create.py
index 8dae53ff78..27b93c538e 100644
--- a/src/azure/cli/commands/template_create.py
+++ b/src/azure/cli/commands/template_create.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 import argparse
 
diff --git a/src/azure/cli/commands/validators.py b/src/azure/cli/commands/validators.py
index 60bad3b016..271447e64e 100644
--- a/src/azure/cli/commands/validators.py
+++ b/src/azure/cli/commands/validators.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import argparse
 import time
 import random
diff --git a/src/azure/cli/extensions/__init__.py b/src/azure/cli/extensions/__init__.py
index 84dffe9399..ffaa3625d0 100644
--- a/src/azure/cli/extensions/__init__.py
+++ b/src/azure/cli/extensions/__init__.py
@@ -1,4 +1,9 @@
-from .query import register as register_query
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from .query import register as register_query
 from .transform import register as register_transform
 
 def register_extensions(application):
diff --git a/src/azure/cli/extensions/experimental.py b/src/azure/cli/extensions/experimental.py
index f3de3a5760..7ba169b6a9 100644
--- a/src/azure/cli/extensions/experimental.py
+++ b/src/azure/cli/extensions/experimental.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 def register(event_dispatcher):
     def _enable_experimental_handlers(_, event_data):
         """The user can opt in to experimental event handlers by
diff --git a/src/azure/cli/extensions/query.py b/src/azure/cli/extensions/query.py
index 9af24096c4..40d5d576dd 100644
--- a/src/azure/cli/extensions/query.py
+++ b/src/azure/cli/extensions/query.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import collections
 
 def jmespath_type(raw_query):
diff --git a/src/azure/cli/extensions/transform.py b/src/azure/cli/extensions/transform.py
index 50cbeb1578..d94afda339 100644
--- a/src/azure/cli/extensions/transform.py
+++ b/src/azure/cli/extensions/transform.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import re
 
 def register(application):
diff --git a/src/azure/cli/help_files.py b/src/azure/cli/help_files.py
index 3d96622629..44860b752a 100644
--- a/src/azure/cli/help_files.py
+++ b/src/azure/cli/help_files.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import yaml
 
 # modules should add entries to helps in the form: "group command": "YAML help"
diff --git a/src/azure/cli/main.py b/src/azure/cli/main.py
index 1d4792dfc9..da14c424ca 100644
--- a/src/azure/cli/main.py
+++ b/src/azure/cli/main.py
@@ -1,4 +1,9 @@
-import os
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+import os
 import sys
 
 from azure.cli.application import APPLICATION, Configuration
diff --git a/src/azure/cli/parser.py b/src/azure/cli/parser.py
index 35224bfc6e..c7c74af46c 100644
--- a/src/azure/cli/parser.py
+++ b/src/azure/cli/parser.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import argparse
 import argcomplete
 import azure.cli._help as _help
diff --git a/src/azure/cli/tests/test_add_resourcegroup_transform.py b/src/azure/cli/tests/test_add_resourcegroup_transform.py
index a0a15aa8a4..df9604095c 100644
--- a/src/azure/cli/tests/test_add_resourcegroup_transform.py
+++ b/src/azure/cli/tests/test_add_resourcegroup_transform.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 from six import StringIO
 from azure.cli.extensions.transform import _parse_id, _add_resource_group
diff --git a/src/azure/cli/tests/test_application.py b/src/azure/cli/tests/test_application.py
index 43bad4e0dc..2fd09c61af 100644
--- a/src/azure/cli/tests/test_application.py
+++ b/src/azure/cli/tests/test_application.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 from collections import namedtuple
 
diff --git a/src/azure/cli/tests/test_command_registration.py b/src/azure/cli/tests/test_command_registration.py
index 3a8d57719f..534711c81b 100644
--- a/src/azure/cli/tests/test_command_registration.py
+++ b/src/azure/cli/tests/test_command_registration.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import logging
 import unittest
 
diff --git a/src/azure/cli/tests/test_connection_verify.py b/src/azure/cli/tests/test_connection_verify.py
index 371d10e1a2..30be7b9887 100644
--- a/src/azure/cli/tests/test_connection_verify.py
+++ b/src/azure/cli/tests/test_connection_verify.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import os
 import logging
 import unittest
diff --git a/src/azure/cli/tests/test_extensions_query.py b/src/azure/cli/tests/test_extensions_query.py
index 33218fc254..51ce1d0215 100644
--- a/src/azure/cli/tests/test_extensions_query.py
+++ b/src/azure/cli/tests/test_extensions_query.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 
 from azure.cli.extensions.query import jmespath_type
diff --git a/src/azure/cli/tests/test_help.py b/src/azure/cli/tests/test_help.py
index 5ddc75e76a..8f1cb42329 100644
--- a/src/azure/cli/tests/test_help.py
+++ b/src/azure/cli/tests/test_help.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 import sys
 import unittest
diff --git a/src/azure/cli/tests/test_logging.py b/src/azure/cli/tests/test_logging.py
index 12b29c12cf..75754e23e6 100644
--- a/src/azure/cli/tests/test_logging.py
+++ b/src/azure/cli/tests/test_logging.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 import azure.cli._logging as _logging
 
diff --git a/src/azure/cli/tests/test_main.py b/src/azure/cli/tests/test_main.py
index de50db246d..a13d79d85e 100644
--- a/src/azure/cli/tests/test_main.py
+++ b/src/azure/cli/tests/test_main.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 
 from azure.cli.main import main as cli
diff --git a/src/azure/cli/tests/test_output.py b/src/azure/cli/tests/test_output.py
index 48791fcf45..b756a5235a 100644
--- a/src/azure/cli/tests/test_output.py
+++ b/src/azure/cli/tests/test_output.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
  # pylint: disable=protected-access, bad-continuation, too-many-public-methods, trailing-whitespace
 import unittest
diff --git a/src/azure/cli/tests/test_parser.py b/src/azure/cli/tests/test_parser.py
index b9a516fa34..d391d4082c 100644
--- a/src/azure/cli/tests/test_parser.py
+++ b/src/azure/cli/tests/test_parser.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 from six import StringIO
 from azure.cli.parser import AzCliCommandParser
diff --git a/src/azure/cli/tests/test_profile.py b/src/azure/cli/tests/test_profile.py
index e44b78a2f4..7b88835b24 100644
--- a/src/azure/cli/tests/test_profile.py
+++ b/src/azure/cli/tests/test_profile.py
@@ -1,4 +1,9 @@
-# pylint: disable=protected-access, unsubscriptable-object
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# pylint: disable=protected-access, unsubscriptable-object
 import json
 import unittest
 import mock
diff --git a/src/azure/cli/tests/test_resource_id.py b/src/azure/cli/tests/test_resource_id.py
index 2ebdc983b2..8419797623 100644
--- a/src/azure/cli/tests/test_resource_id.py
+++ b/src/azure/cli/tests/test_resource_id.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=line-too-long
 import unittest
 from six import StringIO
diff --git a/src/azure/cli/tests/test_validators.py b/src/azure/cli/tests/test_validators.py
index 8b8e94af22..53b3b5658e 100644
--- a/src/azure/cli/tests/test_validators.py
+++ b/src/azure/cli/tests/test_validators.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 from six import StringIO
 
diff --git a/src/azure/cli/tests/test_vcr_security.py b/src/azure/cli/tests/test_vcr_security.py
index 6c49363f68..553f27e8e8 100644
--- a/src/azure/cli/tests/test_vcr_security.py
+++ b/src/azure/cli/tests/test_vcr_security.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=line-too-long
 import os
 import unittest
@@ -36,14 +41,14 @@ class Test_vcr_security(unittest.TestCase):
 
     def test_deployment_name_scrub(self):
         from azure.cli.utils.vcr_test_base import _scrub_deployment_name as scrub_deployment_name
-        uri1 = 'https://www.test.com/deployments/azurecli1466174372.33571889479?api-version=2015-11-01'
-        uri2 = 'https://www.test.com/deployments/azurecli1466174372.33571889479/more'
+        uri1 = 'https://www.contoso.com/deployments/azurecli1466174372.33571889479?api-version=2015-11-01'
+        uri2 = 'https://www.contoso.com/deployments/azurecli1466174372.33571889479/more'
 
         uri1 = scrub_deployment_name(uri1)
         uri2 = scrub_deployment_name(uri2)
 
-        self.assertEqual(uri1, 'https://www.test.com/deployments/mock-deployment?api-version=2015-11-01')
-        self.assertEqual(uri2, 'https://www.test.com/deployments/mock-deployment/more')
+        self.assertEqual(uri1, 'https://www.contoso.com/deployments/mock-deployment?api-version=2015-11-01')
+        self.assertEqual(uri2, 'https://www.contoso.com/deployments/mock-deployment/more')
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/src/azure/cli/utils/update_checker.py b/src/azure/cli/utils/update_checker.py
index 28f348ec2f..fb79db3fec 100644
--- a/src/azure/cli/utils/update_checker.py
+++ b/src/azure/cli/utils/update_checker.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import os
 import re
 import imp
diff --git a/src/azure/cli/utils/vcr_test_base.py b/src/azure/cli/utils/vcr_test_base.py
index bba956f642..11e2f9ebe8 100644
--- a/src/azure/cli/utils/vcr_test_base.py
+++ b/src/azure/cli/utils/vcr_test_base.py
@@ -1,4 +1,9 @@
-from __future__ import print_function
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from __future__ import print_function
 
 import json
 import os
diff --git a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/__init__.py b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/__init__.py
index b335baf926..186a29cc6c 100644
--- a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/__init__.py
+++ b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=unused-import
 
 import azure.cli.command_modules.component._params
diff --git a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/_params.py b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/_params.py
index 41e87104e0..44ab4b7f2d 100644
--- a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/_params.py
+++ b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/_params.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from azure.cli.commands import register_cli_argument, CliArgumentType
 
 # BASIC PARAMETER CONFIGURATION
diff --git a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py
index c929134812..155818a726 100644
--- a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py
+++ b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=no-self-use
 from __future__ import print_function
 import os
diff --git a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/generated.py b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/generated.py
index 4739d837dc..fe4d6d6451 100644
--- a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/generated.py
+++ b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/generated.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 
 from azure.cli.commands import cli_command
diff --git a/src/command_modules/azure-cli-component/setup.py b/src/command_modules/azure-cli-component/setup.py
index 3da7d7b507..1183dfeb01 100644
--- a/src/command_modules/azure-cli-component/setup.py
+++ b/src/command_modules/azure-cli-component/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.9'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -48,7 +35,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/src/command_modules/azure-cli-feedback/azure/cli/command_modules/feedback/__init__.py b/src/command_modules/azure-cli-feedback/azure/cli/command_modules/feedback/__init__.py
index c793fe8592..95e51c6da0 100644
--- a/src/command_modules/azure-cli-feedback/azure/cli/command_modules/feedback/__init__.py
+++ b/src/command_modules/azure-cli-feedback/azure/cli/command_modules/feedback/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 import sys
 from six.moves import input #pylint: disable=redefined-builtin
diff --git a/src/command_modules/azure-cli-feedback/setup.py b/src/command_modules/azure-cli-feedback/setup.py
index 2d1479fa7c..f50e7ef526 100644
--- a/src/command_modules/azure-cli-feedback/setup.py
+++ b/src/command_modules/azure-cli-feedback/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.1'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -48,7 +35,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools Feedback Command Module',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
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 c24c42172c..876e662dbd 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
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=unused-import
 
 import azure.cli.command_modules.network._params
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_factory.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_factory.py
index 5b53163a68..1d88911a0c 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_factory.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_factory.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from azure.mgmt.network import NetworkManagementClient
 from azure.cli.commands.client_factory import get_mgmt_service_client
 
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_params.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_params.py
index 648488a860..e579f0030e 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_params.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_params.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=line-too-long
 import argparse
 
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py
index 3214b0202d..4ef103c25e 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import argparse
 import base64
 import socket
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py
index 044dd04aed..61c048938c 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py
@@ -1,4 +1,9 @@
-# pylint: disable=no-self-use,too-many-arguments,no-member
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# pylint: disable=no-self-use,too-many-arguments,no-member
 from azure.mgmt.network.models import Subnet, SecurityRule, NetworkSecurityGroup
 
 from azure.cli._util import CLIError
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/generated.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/generated.py
index 3232b1d0a9..b328b53144 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/generated.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/generated.py
@@ -1,4 +1,9 @@
-from azure.mgmt.network.operations import (
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from azure.mgmt.network.operations import (
     ApplicationGatewaysOperations,
     ExpressRouteCircuitAuthorizationsOperations,
     ExpressRouteCircuitPeeringsOperations,
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/test_network_commands.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/test_network_commands.py
index 7a635f2b3e..8e9fc2bf03 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/test_network_commands.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/test_network_commands.py
@@ -1,4 +1,9 @@
-#pylint: disable=method-hidden
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+#pylint: disable=method-hidden
 #pylint: disable=line-too-long
 #pylint: disable=bad-continuation
 import os
diff --git a/src/command_modules/azure-cli-network/setup.py b/src/command_modules/azure-cli-network/setup.py
index 3c065da3c0..094216b213 100644
--- a/src/command_modules/azure-cli-network/setup.py
+++ b/src/command_modules/azure-cli-network/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.5'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -48,7 +35,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/__init__.py b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/__init__.py
index b57ecde123..6456462925 100644
--- a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/__init__.py
+++ b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=unused-import
 
 import azure.cli.command_modules.profile._params
diff --git a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/_params.py b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/_params.py
index 6f20942396..6dc34b2334 100644
--- a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/_params.py
+++ b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/_params.py
@@ -1,4 +1,9 @@
-from azure.cli.commands import CliArgumentType, register_cli_argument
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from azure.cli.commands import CliArgumentType, register_cli_argument
 from .custom import load_subscriptions
 # BASIC PARAMETER CONFIGURATION
 
diff --git a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/custom.py b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/custom.py
index 3f580a2547..44cf2ff4e6 100644
--- a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/custom.py
+++ b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/custom.py
@@ -1,4 +1,9 @@
-# pylint: disable=too-few-public-methods,too-many-arguments,no-self-use
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# pylint: disable=too-few-public-methods,too-many-arguments,no-self-use
 #TODO: update adal-python to support it
 #from azure.cli._debug import should_disable_connection_verify
 import datetime
diff --git a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/generated.py b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/generated.py
index 5fca478e19..b195e21906 100644
--- a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/generated.py
+++ b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/generated.py
@@ -1,4 +1,9 @@
-from __future__ import print_function
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from __future__ import print_function
 
 from azure.cli.commands import cli_command
 
diff --git a/src/command_modules/azure-cli-profile/setup.py b/src/command_modules/azure-cli-profile/setup.py
index 73b93d8d2c..ee53692fcc 100644
--- a/src/command_modules/azure-cli-profile/setup.py
+++ b/src/command_modules/azure-cli-profile/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.3'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -49,7 +36,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/__init__.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/__init__.py
index da194213ad..b9a39a7711 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/__init__.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=unused-import
 
 import azure.cli.command_modules.resource._params
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_factory.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_factory.py
index 1c00af04f9..1a2494ae4f 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_factory.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_factory.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from azure.mgmt.resource.resources import ResourceManagementClient
 from azure.cli.commands.client_factory import get_mgmt_service_client
 
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_params.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_params.py
index d60120c95b..4170321563 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_params.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_params.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=line-too-long
 import argparse
 
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_validators.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_validators.py
index 72a305e553..0cfac3f33b 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_validators.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_validators.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import collections
 
 from azure.cli.parser import IncorrectUsageError
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/custom.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/custom.py
index 80542e2713..a3a601fcad 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/custom.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/custom.py
@@ -1,4 +1,9 @@
-# pylint: disable=too-few-public-methods,no-self-use,too-many-arguments
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# pylint: disable=too-few-public-methods,no-self-use,too-many-arguments
 
 from __future__ import print_function
 import json
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/generated.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/generated.py
index aeb79288d7..ca6bfd19f0 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/generated.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/generated.py
@@ -1,4 +1,9 @@
-# pylint: disable=line-too-long
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# pylint: disable=line-too-long
 from azure.mgmt.resource.resources.operations.resources_operations import ResourcesOperations
 from azure.mgmt.resource.resources.operations.providers_operations import ProvidersOperations
 from azure.mgmt.resource.resources.operations.resource_groups_operations \
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_api_check.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_api_check.py
index 6147f46a9f..3612df36cf 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_api_check.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_api_check.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 try:
     from unittest.mock import MagicMock
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource.py
index b5300af46c..ffd9400580 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import os
 # AZURE CLI RESOURCE TEST DEFINITIONS
 
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource_list_odata_filter.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource_list_odata_filter.py
index 1419aaecb3..dbb3e59626 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource_list_odata_filter.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource_list_odata_filter.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 from azure.cli.command_modules.resource.custom import _list_resources_odata_filter_builder
 from azure.cli.parser import IncorrectUsageError
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_validators.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_validators.py
index 2806756d7e..fae234d0d4 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_validators.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_validators.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import unittest
 from six import StringIO
 
diff --git a/src/command_modules/azure-cli-resource/setup.py b/src/command_modules/azure-cli-resource/setup.py
index 8f73f2a063..1c2881c1a0 100644
--- a/src/command_modules/azure-cli-resource/setup.py
+++ b/src/command_modules/azure-cli-resource/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.5'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -48,7 +35,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/__init__.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/__init__.py
index c090e3e89b..cbe0bfb15b 100644
--- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/__init__.py
+++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=unused-import
 
 import azure.cli.command_modules.role.generated
diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_params.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_params.py
index 74e55b289f..7e64f4dc14 100644
--- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_params.py
+++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_params.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from azure.mgmt.authorization import AuthorizationManagementClient
 
 import azure.cli.commands.parameters #pylint: disable=unused-import
diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/custom.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/custom.py
index d03c135ab2..26545d2528 100644
--- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/custom.py
+++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/custom.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import uuid
 import re
 
diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/generated.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/generated.py
index 2c3524dce6..377490644a 100644
--- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/generated.py
+++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/generated.py
@@ -1,4 +1,9 @@
-# pylint: disable=line-too-long
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# pylint: disable=line-too-long
 from __future__ import print_function
 
 from azure.mgmt.authorization.operations import RoleAssignmentsOperations, RoleDefinitionsOperations
diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/test_role.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/test_role.py
index 9c2595f867..d2164d5ab6 100644
--- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/test_role.py
+++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/test_role.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # AZURE CLI RBAC TEST DEFINITIONS
 import json
 
diff --git a/src/command_modules/azure-cli-role/setup.py b/src/command_modules/azure-cli-role/setup.py
index b285513448..47bce1dac1 100644
--- a/src/command_modules/azure-cli-role/setup.py
+++ b/src/command_modules/azure-cli-role/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.1'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -48,7 +35,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py
index b9756079b3..dfcf15af56 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=unused-import
 
 import azure.cli.command_modules.storage._params
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_command_type.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_command_type.py
index 2e5c4f58a5..4844958b51 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_command_type.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_command_type.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from azure.cli.commands import create_command, command_table
 
 from azure.cli.command_modules.storage._validators import validate_client_parameters
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_factory.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_factory.py
index aff9d0d4dc..2614cd6602 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_factory.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_factory.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from azure.mgmt.storage import StorageManagementClient
 
 from azure.storage import CloudStorageAccount
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py
index 4dde6797d3..88d9b57e94 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=line-too-long
 from azure.cli.commands.parameters import (tags_type,
                                            name_type,
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py
index 307914183d..c64f89e7fe 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from datetime import datetime
 import os
 import re
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/custom.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/custom.py
index dd1838ba03..1e1ff185ce 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/custom.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/custom.py
@@ -1,4 +1,9 @@
- # pylint: disable=no-self-use,too-many-arguments
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# pylint: disable=no-self-use,too-many-arguments
 
 from __future__ import print_function
 from sys import stderr
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/generated.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/generated.py
index 991ca6af2a..53ca43b309 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/generated.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/generated.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=line-too-long
 from __future__ import print_function
 
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/test_storage.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/test_storage.py
index 6253746b30..2ed6c62a9d 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/test_storage.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/test_storage.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # AZURE CLI STORAGE TEST DEFINITIONS
 #pylint: skip-file
 
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/test_validators.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/test_validators.py
index f9eb8ce4f1..6e4de04bad 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/test_validators.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/test_validators.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 #pylint: skip-file
 import unittest
 from six import StringIO
diff --git a/src/command_modules/azure-cli-storage/setup.py b/src/command_modules/azure-cli-storage/setup.py
index d7afad737f..d1178b0b1f 100644
--- a/src/command_modules/azure-cli-storage/setup.py
+++ b/src/command_modules/azure-cli-storage/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.5'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -48,7 +35,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/__init__.py b/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/__init__.py
index 2dc2413bcc..e86328e869 100644
--- a/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/__init__.py
+++ b/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=unused-import
 
 import azure.cli.command_modules.taskhelp.generated
diff --git a/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/custom.py b/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/custom.py
index aaa279063f..6932ed93ba 100644
--- a/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/custom.py
+++ b/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/custom.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=no-self-use,too-few-public-methods
 from __future__ import print_function
 
diff --git a/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/generated.py b/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/generated.py
index 79fdd5df49..8930ee8b5e 100644
--- a/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/generated.py
+++ b/src/command_modules/azure-cli-taskhelp/azure/cli/command_modules/taskhelp/generated.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from __future__ import print_function
 
 from azure.cli.commands import cli_command
diff --git a/src/command_modules/azure-cli-taskhelp/setup.py b/src/command_modules/azure-cli-taskhelp/setup.py
index 4e676384d9..d4e8588c6f 100644
--- a/src/command_modules/azure-cli-taskhelp/setup.py
+++ b/src/command_modules/azure-cli-taskhelp/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.3'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -47,7 +34,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/__init__.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/__init__.py
index c9a6166768..9587edb1fe 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/__init__.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=unused-import
 
 import azure.cli.command_modules.vm._help
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py
index 273ab0aec0..882ddd4753 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py
@@ -1,4 +1,9 @@
-import argparse
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+import argparse
 import json
 import math
 import os
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_factory.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_factory.py
index 733c3c17cc..2f04d78f33 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_factory.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_factory.py
@@ -1,4 +1,9 @@
-from azure.cli.commands.client_factory import (
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from azure.cli.commands.client_factory import (
     get_mgmt_service_client,
     get_subscription_service_client)
 
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py
index 010310690f..b083c06c2a 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from azure.cli.help_files import helps
 
 #pylint: disable=line-too-long
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py
index f953bdf360..e7b946b057 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py
@@ -1,4 +1,9 @@
-# pylint: disable=line-too-long
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# pylint: disable=line-too-long
 import argparse
 import getpass
 import os
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_validators.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_validators.py
index 272234524f..de2424ff57 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_validators.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_validators.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 import random
 
 def nsg_name_validator(namespace):
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_vm_utils.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_vm_utils.py
index e32828215c..278d7b81ae 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_vm_utils.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_vm_utils.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from codecs import open as codecs_open
 import json
 import os
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py
index 6809462b0f..8d3de72409 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py
@@ -1,4 +1,9 @@
-# pylint: disable=no-self-use,too-many-arguments
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# pylint: disable=no-self-use,too-many-arguments
 from __future__ import print_function
 import json
 import os
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/generated.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/generated.py
index 3b32959043..d2a6e90aca 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/generated.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/generated.py
@@ -1,4 +1,9 @@
-from azure.mgmt.compute.operations import (
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+from azure.mgmt.compute.operations import (
     AvailabilitySetsOperations,
     VirtualMachineExtensionImagesOperations,
     VirtualMachineExtensionsOperations,
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_custom_vm_commands.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_custom_vm_commands.py
index 73a4abb1d1..921413680c 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_custom_vm_commands.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_custom_vm_commands.py
@@ -1,4 +1,9 @@
-import unittest
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+import unittest
 import mock
 from azure.cli.command_modules.vm.custom import enable_boot_diagnostics, disable_boot_diagnostics
 from azure.cli.command_modules.vm.custom import (_get_access_extension_upgrade_info,
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py
index 66c862a7b8..154d478c7a 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py
@@ -1,4 +1,9 @@
-# AZURE CLI VM TEST DEFINITIONS
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+# AZURE CLI VM TEST DEFINITIONS
 import json
 import os
 import tempfile
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_image.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_image.py
index fe22d06696..7ef7da3a5e 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_image.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_image.py
@@ -1,4 +1,9 @@
-import os.path
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+import os.path
 import unittest
 import mock
 
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_parameters.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_parameters.py
index 6486db4349..6b479e46b6 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_parameters.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_parameters.py
@@ -1,4 +1,9 @@
-import unittest
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+import unittest
 
 from azure.cli.application import APPLICATION, Configuration
 
diff --git a/src/command_modules/azure-cli-vm/setup.py b/src/command_modules/azure-cli-vm/setup.py
index 4c4608a7fe..32b940c49e 100644
--- a/src/command_modules/azure-cli-vm/setup.py
+++ b/src/command_modules/azure-cli-vm/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.5'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -48,7 +35,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',
diff --git a/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/__init__.py b/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/__init__.py
index fa85f04d08..a3bbc2a7c6 100644
--- a/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/__init__.py
+++ b/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/__init__.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 # pylint: disable=unused-import
 
 import azure.cli.command_modules.webapp._params
diff --git a/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/_params.py b/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/_params.py
index 422ee3c75a..f43d1a2413 100644
--- a/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/_params.py
+++ b/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/_params.py
@@ -1,3 +1,8 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
 from azure.cli.commands import CliArgumentType, register_cli_argument
 import azure.cli.commands.parameters #pylint: disable=unused-import
 
diff --git a/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/generated.py b/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/generated.py
index d03596f610..dc852b7437 100644
--- a/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/generated.py
+++ b/src/command_modules/azure-cli-webapp/azure/cli/command_modules/webapp/generated.py
@@ -1,4 +1,9 @@
-#pylint: disable=unused-import
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+
+#pylint: disable=unused-import
 from azure.mgmt.web.operations import SitesOperations
 
 from azure.cli.commands import LongRunningOperation, cli_command
diff --git a/src/command_modules/azure-cli-webapp/setup.py b/src/command_modules/azure-cli-webapp/setup.py
index 678cf7a737..8aebc0c87d 100644
--- a/src/command_modules/azure-cli-webapp/setup.py
+++ b/src/command_modules/azure-cli-webapp/setup.py
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
 
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
 
 from codecs import open
 from setuptools import setup
 
 VERSION = '0.0.1'
 
-# The full list of classifiers is available at
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
     'Intended Audience :: Developers',
@@ -32,8 +20,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
-    #'License :: OSI Approved :: Apache Software License',
-    #'License :: OSI Approved :: MIT License',
+    'License :: OSI Approved :: MIT License',
 ]
 
 DEPENDENCIES = [
@@ -48,7 +35,7 @@ setup(
     version=VERSION,
     description='Microsoft Azure Command-Line Tools',
     long_description=README,
-    license='TBD',
+    license='MIT',
     author='Microsoft Corporation',
     author_email='azpycli@microsoft.com',
     url='https://github.com/Azure/azure-cli',