diff --git a/.travis.yml b/.travis.yml
index 411a3037..22ce08e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
-  - "3.5"
-  - "3.6"
+  - 3.5
+  - 3.6
 
 install:
   - pip install -r requirements.txt
@@ -13,4 +13,14 @@ script:
 
 branches:
   only:
-  - master
+    - master
+
+deploy:
+  provider: pypi
+  distributions: "sdist bdist_wheel"
+  user: aztk
+  password:
+    secure: j/mwA+hWudujDZ+JkgN3hDBUcIH3Vt1SWsvxnyUadErFsi9S9bW8OZ8kOp3R8yj73pnaENADmvDPjBt6w39b3h7l/EmNYlEdsAuPBMmaNQ0+fmPiKLCcALVIt/Odxdc+a1p2p+F3HEatqMCkaSRUs9gcHSYA1P57rt7y6i28xrCTt1ayQrdOZofgyAx4egocFQlgXgFpQIO3vNXySmc5HaIJF8h84CUKvLG/jv9bHgDoT7n2F00sQQV/tLbXdWEA2LcJFN5q4gjk3AwFtofTtMzlk3IE3y3qp9DagWbdsKoy9+b31lypVDBiIp/N+kCm/pwYDJXyG0H7U1pev2F8K/f4xF2x0AJDJJamLczAY4Ac4AMPImlI3cCpSS6htQhb+i5+KeEUW2tm+xGmdprOSto2712C4TNMna25x+WZteuPmRGYTmmDxGSeD769lE6TMGqrJTlmpkzndJiyp8ek/86hJPJUQoPfDadWdIdcA4wCjpXFBach4DYEItKvYoIk/KfK3wdqp3Lbs+MhT+JhuXGR0RRWlkCROiIo48TwQ716ddvjy2PPxwxNhplu3BdyEXLEDGN9EnEL+3L5P0GELhB4+KstjXSbECBYzULJ1+4kzvrdSB3K9F41stpT7x9PN9mK0t9FrVpXWbNozuJqkCvVVtz2ZSJ+20kvSuI1TPA=
+  on:
+    python: 3.6
+    tags: true
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 35955dc9..22ee7178 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,7 +5,8 @@
         "bin/**": true
     },
     "files.exclude": {
-        "**/__pycache__": true
+        "**/__pycache__": true,
+        "*.egg-info": true,
     },
     "python.autoComplete.extraPaths": [
         "${workspaceRoot}/node_scripts"
diff --git a/aztk/utils/constants.py b/aztk/utils/constants.py
index 02760e17..f271747f 100644
--- a/aztk/utils/constants.py
+++ b/aztk/utils/constants.py
@@ -43,7 +43,7 @@
 """
     Source and destination paths for spark init
 """
-INIT_DIRECTORY_SOURCE = os.path.join(ROOT_PATH, 'config')
+INIT_DIRECTORY_SOURCE = os.path.join(ROOT_PATH, "aztk_cli", 'config')
 LOCAL_INIT_DIRECTORY_DEST = os.path.join(os.getcwd(), '.aztk')
 GLOBAL_INIT_DIRECTORY_DEST = os.path.join(HOME_DIRECTORY_PATH, '.aztk')
 """
diff --git a/aztk/version.py b/aztk/version.py
index 7bf24127..acf75f01 100644
--- a/aztk/version.py
+++ b/aztk/version.py
@@ -22,4 +22,4 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-__version__ = '0.6.0'
+__version__ = '0.7.0b9'
diff --git a/aztk_cli/__init__.py b/aztk_cli/__init__.py
new file mode 100644
index 00000000..7f2ec90a
--- /dev/null
+++ b/aztk_cli/__init__.py
@@ -0,0 +1,2 @@
+import aztk_cli.logger
+log = aztk_cli.logger.root
diff --git a/cli/config.py b/aztk_cli/config.py
similarity index 99%
rename from cli/config.py
rename to aztk_cli/config.py
index ff4513a7..8eea18a7 100644
--- a/cli/config.py
+++ b/aztk_cli/config.py
@@ -1,6 +1,6 @@
 import os
 import yaml
-from cli import log
+from aztk_cli import log
 import aztk.spark
 from aztk.spark.models import (
     SecretsConfiguration,
diff --git a/config/cluster.yaml b/aztk_cli/config/cluster.yaml
similarity index 100%
rename from config/cluster.yaml
rename to aztk_cli/config/cluster.yaml
diff --git a/config/core-site.xml b/aztk_cli/config/core-site.xml
similarity index 100%
rename from config/core-site.xml
rename to aztk_cli/config/core-site.xml
diff --git a/config/jars/azure-data-lake-store-sdk-2.0.11.jar b/aztk_cli/config/jars/azure-data-lake-store-sdk-2.0.11.jar
similarity index 100%
rename from config/jars/azure-data-lake-store-sdk-2.0.11.jar
rename to aztk_cli/config/jars/azure-data-lake-store-sdk-2.0.11.jar
diff --git a/config/jars/azure-storage-2.0.0.jar b/aztk_cli/config/jars/azure-storage-2.0.0.jar
similarity index 100%
rename from config/jars/azure-storage-2.0.0.jar
rename to aztk_cli/config/jars/azure-storage-2.0.0.jar
diff --git a/config/jars/hadoop-azure-2.7.3.jar b/aztk_cli/config/jars/hadoop-azure-2.7.3.jar
similarity index 100%
rename from config/jars/hadoop-azure-2.7.3.jar
rename to aztk_cli/config/jars/hadoop-azure-2.7.3.jar
diff --git a/config/jars/hadoop-azure-datalake-3.0.0-alpha2.jar b/aztk_cli/config/jars/hadoop-azure-datalake-3.0.0-alpha2.jar
similarity index 100%
rename from config/jars/hadoop-azure-datalake-3.0.0-alpha2.jar
rename to aztk_cli/config/jars/hadoop-azure-datalake-3.0.0-alpha2.jar
diff --git a/config/job.yaml b/aztk_cli/config/job.yaml
similarity index 100%
rename from config/job.yaml
rename to aztk_cli/config/job.yaml
diff --git a/config/secrets.yaml.template b/aztk_cli/config/secrets.yaml.template
similarity index 100%
rename from config/secrets.yaml.template
rename to aztk_cli/config/secrets.yaml.template
diff --git a/config/spark-defaults.conf b/aztk_cli/config/spark-defaults.conf
similarity index 100%
rename from config/spark-defaults.conf
rename to aztk_cli/config/spark-defaults.conf
diff --git a/config/spark-env.sh b/aztk_cli/config/spark-env.sh
similarity index 100%
rename from config/spark-env.sh
rename to aztk_cli/config/spark-env.sh
diff --git a/config/ssh.yaml b/aztk_cli/config/ssh.yaml
similarity index 100%
rename from config/ssh.yaml
rename to aztk_cli/config/ssh.yaml
diff --git a/cli/constants.py b/aztk_cli/constants.py
similarity index 100%
rename from cli/constants.py
rename to aztk_cli/constants.py
diff --git a/cli/entrypoint.py b/aztk_cli/entrypoint.py
similarity index 94%
rename from cli/entrypoint.py
rename to aztk_cli/entrypoint.py
index aefaaa3f..1779f38a 100644
--- a/cli/entrypoint.py
+++ b/aztk_cli/entrypoint.py
@@ -8,8 +8,8 @@
 from typing import NamedTuple
 import azure.batch.models.batch_error as batch_error
 import aztk
-from cli import logger, log, utils, constants
-from cli.spark.endpoints import spark
+from aztk_cli import logger, log, utils, constants
+from aztk_cli.spark.endpoints import spark
 from . import plugins
 
 def main():
diff --git a/cli/logger.py b/aztk_cli/logger.py
similarity index 100%
rename from cli/logger.py
rename to aztk_cli/logger.py
diff --git a/cli/plugins.py b/aztk_cli/plugins.py
similarity index 97%
rename from cli/plugins.py
rename to aztk_cli/plugins.py
index b2d780d0..4a0c21d8 100644
--- a/cli/plugins.py
+++ b/aztk_cli/plugins.py
@@ -1,6 +1,6 @@
 import argparse
 import typing
-from cli import log
+from aztk_cli import log
 from aztk.models.plugins.internal import plugin_manager
 
 
diff --git a/cli/spark/__init__.py b/aztk_cli/spark/__init__.py
similarity index 100%
rename from cli/spark/__init__.py
rename to aztk_cli/spark/__init__.py
diff --git a/cli/spark/endpoints/__init__.py b/aztk_cli/spark/endpoints/__init__.py
similarity index 100%
rename from cli/spark/endpoints/__init__.py
rename to aztk_cli/spark/endpoints/__init__.py
diff --git a/cli/spark/endpoints/cluster/__init__.py b/aztk_cli/spark/endpoints/cluster/__init__.py
similarity index 100%
rename from cli/spark/endpoints/cluster/__init__.py
rename to aztk_cli/spark/endpoints/cluster/__init__.py
diff --git a/cli/spark/endpoints/cluster/cluster.py b/aztk_cli/spark/endpoints/cluster/cluster.py
similarity index 100%
rename from cli/spark/endpoints/cluster/cluster.py
rename to aztk_cli/spark/endpoints/cluster/cluster.py
diff --git a/cli/spark/endpoints/cluster/cluster_add_user.py b/aztk_cli/spark/endpoints/cluster/cluster_add_user.py
similarity index 96%
rename from cli/spark/endpoints/cluster/cluster_add_user.py
rename to aztk_cli/spark/endpoints/cluster/cluster_add_user.py
index 75cb648e..5af9b0c5 100644
--- a/cli/spark/endpoints/cluster/cluster_add_user.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_add_user.py
@@ -1,8 +1,8 @@
 import argparse
 import typing
 import aztk.spark
-from cli import log
-from cli import utils, config
+from aztk_cli import log
+from aztk_cli import utils, config
 
 
 def setup_parser(parser: argparse.ArgumentParser):
diff --git a/cli/spark/endpoints/cluster/cluster_app_logs.py b/aztk_cli/spark/endpoints/cluster/cluster_app_logs.py
similarity index 96%
rename from cli/spark/endpoints/cluster/cluster_app_logs.py
rename to aztk_cli/spark/endpoints/cluster/cluster_app_logs.py
index c4b922d3..8c4b6536 100644
--- a/cli/spark/endpoints/cluster/cluster_app_logs.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_app_logs.py
@@ -2,7 +2,7 @@
 import typing
 import aztk
 
-from cli import utils, config
+from aztk_cli import utils, config
 
 def setup_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--id',
diff --git a/cli/spark/endpoints/cluster/cluster_copy.py b/aztk_cli/spark/endpoints/cluster/cluster_copy.py
similarity index 96%
rename from cli/spark/endpoints/cluster/cluster_copy.py
rename to aztk_cli/spark/endpoints/cluster/cluster_copy.py
index 20393e40..b82f50af 100644
--- a/cli/spark/endpoints/cluster/cluster_copy.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_copy.py
@@ -1,7 +1,7 @@
 import argparse
 import typing
 import aztk.spark
-from cli import config
+from aztk_cli import config
 
 
 def setup_parser(parser: argparse.ArgumentParser):
diff --git a/cli/spark/endpoints/cluster/cluster_create.py b/aztk_cli/spark/endpoints/cluster/cluster_create.py
similarity index 96%
rename from cli/spark/endpoints/cluster/cluster_create.py
rename to aztk_cli/spark/endpoints/cluster/cluster_create.py
index 819c0a0a..6726b6d2 100644
--- a/cli/spark/endpoints/cluster/cluster_create.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_create.py
@@ -3,9 +3,9 @@
 import typing
 import aztk.spark
 from aztk.spark.models import ClusterConfiguration, UserConfiguration
-from cli import log
-from cli.config import load_aztk_spark_config
-from cli import utils, config
+from aztk_cli import log
+from aztk_cli.config import load_aztk_spark_config
+from aztk_cli import utils, config
 
 
 def setup_parser(parser: argparse.ArgumentParser):
diff --git a/cli/spark/endpoints/cluster/cluster_delete.py b/aztk_cli/spark/endpoints/cluster/cluster_delete.py
similarity index 97%
rename from cli/spark/endpoints/cluster/cluster_delete.py
rename to aztk_cli/spark/endpoints/cluster/cluster_delete.py
index 42ec1b93..96e05ded 100644
--- a/cli/spark/endpoints/cluster/cluster_delete.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_delete.py
@@ -1,7 +1,7 @@
 import argparse
 import typing
 import aztk
-from cli import log, config
+from aztk_cli import log, config
 
 
 def setup_parser(parser: argparse.ArgumentParser):
diff --git a/cli/spark/endpoints/cluster/cluster_get.py b/aztk_cli/spark/endpoints/cluster/cluster_get.py
similarity index 94%
rename from cli/spark/endpoints/cluster/cluster_get.py
rename to aztk_cli/spark/endpoints/cluster/cluster_get.py
index a3338297..f9f6f3c9 100644
--- a/cli/spark/endpoints/cluster/cluster_get.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_get.py
@@ -1,8 +1,8 @@
 import argparse
 import typing
 import aztk
-from cli import log
-from cli import utils, config
+from aztk_cli import log
+from aztk_cli import utils, config
 
 
 def setup_parser(parser: argparse.ArgumentParser):
diff --git a/cli/spark/endpoints/cluster/cluster_list.py b/aztk_cli/spark/endpoints/cluster/cluster_list.py
similarity index 89%
rename from cli/spark/endpoints/cluster/cluster_list.py
rename to aztk_cli/spark/endpoints/cluster/cluster_list.py
index a50dc3b3..5f1b57f5 100644
--- a/cli/spark/endpoints/cluster/cluster_list.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_list.py
@@ -1,7 +1,7 @@
 import argparse
 import typing
 import aztk
-from cli import utils, config
+from aztk_cli import utils, config
 
 
 def setup_parser(_: argparse.ArgumentParser):
diff --git a/cli/spark/endpoints/cluster/cluster_run.py b/aztk_cli/spark/endpoints/cluster/cluster_run.py
similarity index 94%
rename from cli/spark/endpoints/cluster/cluster_run.py
rename to aztk_cli/spark/endpoints/cluster/cluster_run.py
index d2e2ddf9..6c214b23 100644
--- a/cli/spark/endpoints/cluster/cluster_run.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_run.py
@@ -1,7 +1,7 @@
 import argparse
 import typing
 import aztk.spark
-from cli import utils, config
+from aztk_cli import utils, config
 
 def setup_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--id',
diff --git a/cli/spark/endpoints/cluster/cluster_ssh.py b/aztk_cli/spark/endpoints/cluster/cluster_ssh.py
similarity index 97%
rename from cli/spark/endpoints/cluster/cluster_ssh.py
rename to aztk_cli/spark/endpoints/cluster/cluster_ssh.py
index 10d9b516..75e00e64 100644
--- a/cli/spark/endpoints/cluster/cluster_ssh.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_ssh.py
@@ -1,8 +1,8 @@
 import argparse
 import typing
-from cli import log
-from cli import utils, config
-from cli.config import SshConfig
+from aztk_cli import log
+from aztk_cli import utils, config
+from aztk_cli.config import SshConfig
 import aztk
 import azure.batch.models.batch_error as batch_error
 from aztk.models import ClusterConfiguration
diff --git a/cli/spark/endpoints/cluster/cluster_submit.py b/aztk_cli/spark/endpoints/cluster/cluster_submit.py
similarity index 99%
rename from cli/spark/endpoints/cluster/cluster_submit.py
rename to aztk_cli/spark/endpoints/cluster/cluster_submit.py
index a8c36bf7..00f14bef 100644
--- a/cli/spark/endpoints/cluster/cluster_submit.py
+++ b/aztk_cli/spark/endpoints/cluster/cluster_submit.py
@@ -1,6 +1,6 @@
 import argparse
 import typing
-from cli import utils, config, log
+from aztk_cli import utils, config, log
 import aztk.spark
 
 
diff --git a/cli/spark/endpoints/init.py b/aztk_cli/spark/endpoints/init.py
similarity index 100%
rename from cli/spark/endpoints/init.py
rename to aztk_cli/spark/endpoints/init.py
diff --git a/cli/spark/endpoints/job/__init__.py b/aztk_cli/spark/endpoints/job/__init__.py
similarity index 100%
rename from cli/spark/endpoints/job/__init__.py
rename to aztk_cli/spark/endpoints/job/__init__.py
diff --git a/cli/spark/endpoints/job/delete.py b/aztk_cli/spark/endpoints/job/delete.py
similarity index 97%
rename from cli/spark/endpoints/job/delete.py
rename to aztk_cli/spark/endpoints/job/delete.py
index 7d4f98bf..43156f04 100644
--- a/cli/spark/endpoints/job/delete.py
+++ b/aztk_cli/spark/endpoints/job/delete.py
@@ -1,7 +1,7 @@
 import argparse
 import typing
 import aztk.spark
-from cli import log, config
+from aztk_cli import log, config
 
 
 def setup_parser(parser: argparse.ArgumentParser):
diff --git a/cli/spark/endpoints/job/get.py b/aztk_cli/spark/endpoints/job/get.py
similarity index 89%
rename from cli/spark/endpoints/job/get.py
rename to aztk_cli/spark/endpoints/job/get.py
index 8eb842d4..8715a1f8 100644
--- a/cli/spark/endpoints/job/get.py
+++ b/aztk_cli/spark/endpoints/job/get.py
@@ -2,8 +2,8 @@
 import typing
 import time
 import aztk.spark
-from cli import config
-from cli import utils
+from aztk_cli import config
+from aztk_cli import utils
 
 def setup_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--id',
diff --git a/cli/spark/endpoints/job/get_app.py b/aztk_cli/spark/endpoints/job/get_app.py
similarity index 92%
rename from cli/spark/endpoints/job/get_app.py
rename to aztk_cli/spark/endpoints/job/get_app.py
index cecc7ee9..0ae25c82 100644
--- a/cli/spark/endpoints/job/get_app.py
+++ b/aztk_cli/spark/endpoints/job/get_app.py
@@ -2,8 +2,8 @@
 import typing
 import time
 import aztk.spark
-from cli import config
-from cli import utils
+from aztk_cli import config
+from aztk_cli import utils
 
 def setup_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--id',
diff --git a/cli/spark/endpoints/job/get_app_logs.py b/aztk_cli/spark/endpoints/job/get_app_logs.py
similarity index 94%
rename from cli/spark/endpoints/job/get_app_logs.py
rename to aztk_cli/spark/endpoints/job/get_app_logs.py
index efc583e9..3967f8cb 100644
--- a/cli/spark/endpoints/job/get_app_logs.py
+++ b/aztk_cli/spark/endpoints/job/get_app_logs.py
@@ -1,7 +1,7 @@
 import argparse
 import typing
 import aztk.spark
-from cli import utils, config
+from aztk_cli import utils, config
 
 def setup_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--id',
diff --git a/cli/spark/endpoints/job/job.py b/aztk_cli/spark/endpoints/job/job.py
similarity index 100%
rename from cli/spark/endpoints/job/job.py
rename to aztk_cli/spark/endpoints/job/job.py
diff --git a/cli/spark/endpoints/job/list.py b/aztk_cli/spark/endpoints/job/list.py
similarity index 84%
rename from cli/spark/endpoints/job/list.py
rename to aztk_cli/spark/endpoints/job/list.py
index 1c148c9b..52fd34b8 100644
--- a/cli/spark/endpoints/job/list.py
+++ b/aztk_cli/spark/endpoints/job/list.py
@@ -2,8 +2,8 @@
 import typing
 import time
 import aztk.spark
-from cli import config
-from cli import utils
+from aztk_cli import config
+from aztk_cli import utils
 
 def setup_parser(_: argparse.ArgumentParser):
     # No arguments for list yet
diff --git a/cli/spark/endpoints/job/list_apps.py b/aztk_cli/spark/endpoints/job/list_apps.py
similarity index 89%
rename from cli/spark/endpoints/job/list_apps.py
rename to aztk_cli/spark/endpoints/job/list_apps.py
index 6a247c8d..b70d8d20 100644
--- a/cli/spark/endpoints/job/list_apps.py
+++ b/aztk_cli/spark/endpoints/job/list_apps.py
@@ -1,8 +1,8 @@
 import argparse
 import typing
 import aztk.spark
-from cli import config
-from cli import utils
+from aztk_cli import config
+from aztk_cli import utils
 
 def setup_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--id',
diff --git a/cli/spark/endpoints/job/stop.py b/aztk_cli/spark/endpoints/job/stop.py
similarity index 89%
rename from cli/spark/endpoints/job/stop.py
rename to aztk_cli/spark/endpoints/job/stop.py
index 7238c5ee..bdcf2a89 100644
--- a/cli/spark/endpoints/job/stop.py
+++ b/aztk_cli/spark/endpoints/job/stop.py
@@ -2,8 +2,8 @@
 import typing
 import time
 import aztk.spark
-from cli import config
-from cli import utils
+from aztk_cli import config
+from aztk_cli import utils
 
 def setup_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--id',
diff --git a/cli/spark/endpoints/job/stop_app.py b/aztk_cli/spark/endpoints/job/stop_app.py
similarity index 90%
rename from cli/spark/endpoints/job/stop_app.py
rename to aztk_cli/spark/endpoints/job/stop_app.py
index 66c29554..aa06225a 100644
--- a/cli/spark/endpoints/job/stop_app.py
+++ b/aztk_cli/spark/endpoints/job/stop_app.py
@@ -2,9 +2,9 @@
 import typing
 import time
 import aztk.spark
-from cli import config
-from cli import utils
-from cli import log
+from aztk_cli import config
+from aztk_cli import utils
+from aztk_cli import log
 
 
 def setup_parser(parser: argparse.ArgumentParser):
diff --git a/cli/spark/endpoints/job/submit.py b/aztk_cli/spark/endpoints/job/submit.py
similarity index 96%
rename from cli/spark/endpoints/job/submit.py
rename to aztk_cli/spark/endpoints/job/submit.py
index 13e2e7c8..d6751697 100644
--- a/cli/spark/endpoints/job/submit.py
+++ b/aztk_cli/spark/endpoints/job/submit.py
@@ -2,8 +2,8 @@
 import typing
 import time
 import aztk.spark
-from cli import config, utils, log
-from cli.config import JobConfig, load_aztk_spark_config
+from aztk_cli import config, utils, log
+from aztk_cli.config import JobConfig, load_aztk_spark_config
 
 
 def setup_parser(parser: argparse.ArgumentParser):
diff --git a/cli/spark/endpoints/spark.py b/aztk_cli/spark/endpoints/spark.py
similarity index 100%
rename from cli/spark/endpoints/spark.py
rename to aztk_cli/spark/endpoints/spark.py
diff --git a/cli/utils.py b/aztk_cli/utils.py
similarity index 100%
rename from cli/utils.py
rename to aztk_cli/utils.py
diff --git a/cli/__init__.py b/cli/__init__.py
deleted file mode 100644
index 2a2d75d0..00000000
--- a/cli/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import cli.logger
-log = cli.logger.root
diff --git a/requirements.txt b/requirements.txt
index d70521d2..0c3f4adf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,3 +12,4 @@ yapf==0.20.1
 pylint==1.8.2
 pytest==3.1.3
 pytest-xdist==1.22.0
+twine==1.9.1
diff --git a/setup.py b/setup.py
index cc0b2e6f..7a25c58a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,22 +1,59 @@
+import os
 from setuptools import setup, find_packages
-from cli import constants
+from aztk_cli import constants
 from aztk import version
 
+data_files = []
 
-setup(name='aztk',
-      version=version.__version__,
-      description='Utility for data engineers or platform developers to Run distributed jobs in Azure',
-      url='<tbd>',
-      author='Microsoft',
-      author_email='jiata@microsoft.com',
-      license='MIT',
-      packages=find_packages(),
-      scripts=[
-      #     'bin/aztk',
-      ],
-      entry_points=dict(
-            console_scripts=[
-                  "{0} = cli.entrypoint:main".format(constants.CLI_EXE)
-            ]
-      ),
-      zip_safe=False)
+
+def find_package_files(root, directory, dest=""):
+    paths = []
+    for (path, _, filenames) in os.walk(os.path.join(root, directory)):
+        for filename in filenames:
+            paths.append(os.path.relpath(os.path.join(dest, path, filename), root))
+    return paths
+
+
+with open('README.md') as fd:
+    long_description = fd.read()
+
+setup(
+    name='aztk',
+    version=version.__version__,
+    description='On-demand, Dockerized, Spark Jobs on Azure (powered by Azure Batch)',
+    long_description=long_description,
+    url='https://github.com/Azure/aztk',
+    author='Microsoft',
+    author_email='askaztk@microsoft.com',
+    license='MIT',
+    packages=find_packages(exclude=["tests"]),
+    install_requires=[
+        "azure-batch==3.0.0",
+        "azure-mgmt-batch==5.0.0",
+        "azure-mgmt-storage==1.5.0",
+        "azure-storage==0.33.0",
+        "pyyaml>=3.12",
+        "pycryptodome>=3.4",
+        "paramiko>=2.4",
+    ],
+    package_data={
+        'aztk': find_package_files("", "node_scripts", ".."),
+        'aztk_cli': find_package_files("aztk_cli", "config"),
+    },
+    scripts=[],
+    entry_points=dict(console_scripts=["{0} = aztk_cli.entrypoint:main".format(constants.CLI_EXE)]),
+    zip_safe=False,
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+    ],
+    project_urls={
+        'Documentation': 'https://github.com/Azure/aztk/wiki/',
+        'Source': 'https://github.com/Azure/aztk/',
+        'Tracker': 'https://github.com/Azure/aztk/issues',
+    },
+    python_requires='>=3.5',
+)
diff --git a/tests/spark/integration_tests/sdk/cluster/test_cluster.py b/tests/spark/integration_tests/sdk/cluster/test_cluster.py
index f18700f8..c98600d9 100644
--- a/tests/spark/integration_tests/sdk/cluster/test_cluster.py
+++ b/tests/spark/integration_tests/sdk/cluster/test_cluster.py
@@ -9,7 +9,7 @@
 import pytest
 from aztk.utils import constants
 from aztk.error import AztkError
-from cli import config
+from aztk_cli import config
 
 
 # base cluster name
diff --git a/tests/spark/integration_tests/sdk/job/test_job.py b/tests/spark/integration_tests/sdk/job/test_job.py
index 66693560..14305990 100644
--- a/tests/spark/integration_tests/sdk/job/test_job.py
+++ b/tests/spark/integration_tests/sdk/job/test_job.py
@@ -5,7 +5,7 @@
 
 import aztk.spark
 from aztk.error import AztkError
-from cli import config
+from aztk_cli import config
 
 dt = datetime.now()
 time = dt.microsecond