diff --git a/schaincli/.gitignore b/schaincli/.gitignore
deleted file mode 100644
index cc4af0d..0000000
--- a/schaincli/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*.pyc
-
-dist/
-build/
-*.egg-info/
-
-.tox/
-.coverage
-
-project.py
diff --git a/schaincli/schaincli/cli.py b/schaincli/cli.py
similarity index 98%
rename from schaincli/schaincli/cli.py
rename to schaincli/cli.py
index 99d5afb..a9610b1 100644
--- a/schaincli/schaincli/cli.py
+++ b/schaincli/cli.py
@@ -2,7 +2,7 @@ import click
 import schainpy
 import subprocess
 from multiprocessing import cpu_count
-from schaincli.schaincli import templates
+from schaincli import templates
 from schainpy import controller_api
 import os
 import sys
diff --git a/schaincli/schain.xml b/schaincli/schain.xml
deleted file mode 100644
index baf01d2..0000000
--- a/schaincli/schain.xml
+++ /dev/null
@@ -1 +0,0 @@
-<Project description="A schain project" id="191" name="project"><ReadUnit datatype="SpectraReader" id="1911" inputId="0" name="SpectraReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="SpectraReader" /><Parameter format="str" id="191112" name="path" value="/home/nanosat/schain/schain-cli" /><Parameter format="date" id="191113" name="startDate" value="1970/01/01" /><Parameter format="date" id="191114" name="endDate" value="1970/01/01" /><Parameter format="time" id="191115" name="startTime" value="00:00:00" /><Parameter format="time" id="191116" name="endTime" value="23:59:59" /><Parameter format="int" id="191118" name="cursor" value="0" /><Parameter format="int" id="191119" name="skip" value="0" /><Parameter format="int" id="191120" name="walk" value="1" /><Parameter format="int" id="191121" name="verbose" value="1" /><Parameter format="int" id="191122" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="ParametersProc" id="1913" inputId="1911" name="ParametersProc"><Operation id="19131" name="run" priority="1" type="self" /><Operation id="19132" name="SpectralMoments" priority="2" type="other" /><Operation id="19133" name="PublishData" priority="3" type="other"><Parameter format="int" id="191331" name="zeromq" value="1" /><Parameter format="bool" id="191332" name="verbose" value="0" /></Operation></ProcUnit><ProcUnit datatype="Spectra" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self" /></ProcUnit></Project>
\ No newline at end of file
diff --git a/schaincli/schaincli/__init__.py b/schaincli/schaincli/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/schaincli/schaincli/__init__.py
+++ /dev/null
diff --git a/schaincli/setup.cfg b/schaincli/setup.cfg
deleted file mode 100644
index 5e40900..0000000
--- a/schaincli/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[wheel]
-universal = 1
diff --git a/schaincli/setup.py b/schaincli/setup.py
deleted file mode 100644
index 898cb96..0000000
--- a/schaincli/setup.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""
-Command Line Interface for SIGNAL CHAIN - jro
-"""
-from setuptools import find_packages, setup
-
-dependencies = ['click']
-
-setup(
-    name='schaincli',
-    version='0.1.0',
-    url='http://jro-dev.igp.gob.pe/rhodecode/schain',
-    license='BSD',
-    author='Jose Chavez',
-    author_email='jose.chavez@jro.igp.gob.pe',
-    description='Command Line Interface for SIGNAL CHAIN - jro',
-    long_description=__doc__,
-    packages=find_packages(exclude=['tests']),
-    include_package_data=True,
-    zip_safe=False,
-    platforms='any',
-    install_requires=dependencies,
-    entry_points={
-        'console_scripts': [
-            'schain-cli = schaincli.cli:main',
-        ],
-    },
-    classifiers=[
-        # As from http://pypi.python.org/pypi?%3Aaction=list_classifiers
-        # 'Development Status :: 1 - Planning',
-        # 'Development Status :: 2 - Pre-Alpha',
-        # 'Development Status :: 3 - Alpha',
-        'Development Status :: 4 - Beta',
-        # 'Development Status :: 5 - Production/Stable',
-        # 'Development Status :: 6 - Mature',
-        # 'Development Status :: 7 - Inactive',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: POSIX',
-        'Operating System :: MacOS',
-        'Operating System :: Unix',
-        'Operating System :: Microsoft :: Windows',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 3',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-    ]
-)
diff --git a/schaincli/schaincli/templates.py b/schaincli/templates.py
similarity index 100%
rename from schaincli/schaincli/templates.py
rename to schaincli/templates.py
diff --git a/schaincli/tox.ini b/schaincli/tox.ini
deleted file mode 100644
index c707b1f..0000000
--- a/schaincli/tox.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[tox]
-envlist=py26, py27, py33, py34, pypy, flake8
-
-[testenv]
-commands=py.test --cov schain-cli {posargs}
-deps=
-    pytest
-    pytest-cov
-
-[testenv:flake8]
-basepython = python2.7
-deps =
-    flake8
-commands =
-    flake8 schain-cli tests --max-line-length=120
diff --git a/setup.py b/setup.py
index 9ee79e5..733a287 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(name="schainpy",
         include_package_data=False,
         entry_points={
             'console_scripts': [
-                'schain = schaincli.schaincli.cli:main',
+                'schain = schaincli.cli:main',
             ],
         },
         scripts =['schainpy/gui/schainGUI'],
@@ -48,6 +48,7 @@ setup(name="schainpy",
                           "paramiko >= 2.1.2",
                           "paho-mqtt >= 1.2",
                           "zmq",
-                          "fuzzywuzzy"
+                          "fuzzywuzzy",
+                          "click"
                           ],
       )