diff --git a/poc_modbus_server/dist/poc_modbus_server-0.0-py2.7.egg b/poc_modbus_server/dist/poc_modbus_server-0.0-py2.7.egg
new file mode 100644
index 0000000..d0d1fe2
Binary files /dev/null and b/poc_modbus_server/dist/poc_modbus_server-0.0-py2.7.egg differ
diff --git a/poc_modbus_server/CHANGES.md b/poc_modbus_server/poc_modbus_server/CHANGES.md
similarity index 100%
rename from poc_modbus_server/CHANGES.md
rename to poc_modbus_server/poc_modbus_server/CHANGES.md
diff --git a/poc_modbus_server/README.md b/poc_modbus_server/poc_modbus_server/README.md
similarity index 100%
rename from poc_modbus_server/README.md
rename to poc_modbus_server/poc_modbus_server/README.md
diff --git a/poc_modbus_server/__init__.py b/poc_modbus_server/poc_modbus_server/__init__.py
similarity index 100%
rename from poc_modbus_server/__init__.py
rename to poc_modbus_server/poc_modbus_server/__init__.py
diff --git a/poc_modbus_server/poc_to_modbus.py b/poc_modbus_server/poc_modbus_server/poc_to_modbus.py
similarity index 100%
rename from poc_modbus_server/poc_to_modbus.py
rename to poc_modbus_server/poc_modbus_server/poc_to_modbus.py
diff --git a/poc_modbus_server/poc_modbus_server/setup.py b/poc_modbus_server/poc_modbus_server/setup.py
new file mode 100644
index 0000000..1294d4f
--- /dev/null
+++ b/poc_modbus_server/poc_modbus_server/setup.py
@@ -0,0 +1,117 @@
+"""A setuptools based setup module.
+
+See:
+https://packaging.python.org/en/latest/distributing.html
+https://github.com/pypa/sampleproject
+"""
+
+# Always prefer setuptools over distutils
+from setuptools import setup, find_packages
+# To use a consistent encoding
+from codecs import open
+from os import path
+
+here = path.abspath(path.dirname(__file__))
+
+# Get the long description from the README file
+with open(path.join(here, 'README.md'), encoding='utf-8') as f:
+    long_description = f.read()
+
+setup(
+    name='poc_modbus_server',
+
+    # Versions should comply with PEP440.  For a discussion on single-sourcing
+    # the version across setup.py and the project code, see
+    # https://packaging.python.org/en/latest/single_source_version.html
+    version='0.0.1',
+
+    description='Modbus TCP Server for Henry POC',
+    long_description=long_description,
+
+    # The project's main homepage.
+    url='https://github.com/Henry-Pump/POC-to-ModbusTCP/tree/master/poc_modbus_server',
+
+    # Author details
+    author='Patrick McDonagh',
+    author_email='patrickjmcd@gmail.com',
+
+    # Choose your license
+    license='HenryPump',
+
+    # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
+    classifiers=[
+        # How mature is this project? Common values are
+        #   3 - Alpha
+        #   4 - Beta
+        #   5 - Production/Stable
+        'Development Status :: 3 - Alpha',
+
+        # Indicate who your project is intended for
+        'Intended Audience :: Developers',
+        'Topic :: Software Development :: Build Tools',
+
+        # Pick your license as you wish (should match "license" above)
+        # 'License :: OSI Approved :: MIT License',
+
+        # Specify the Python versions you support here. In particular, ensure
+        # that you indicate whether you support Python 2, Python 3 or both.
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+    ],
+
+    # What does your project relate to?
+    keywords='plc henrypump modbustcp',
+
+    # You can just specify the packages manually here if your project is
+    # simple. Or you can use find_packages().
+    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
+
+    # Alternatively, if you want to distribute just a my_module.py, uncomment
+    # this:
+    #   py_modules=["my_module"],
+
+    # List run-time dependencies here.  These will be installed by pip when
+    # your project is installed. For an analysis of "install_requires" vs pip's
+    # requirements files see:
+    # https://packaging.python.org/en/latest/requirements.html
+    install_requires=['pymongo',
+                      'pymodbus',
+                      'cryptography',
+                      'pyasn1',
+                     ],
+
+    # List additional groups of dependencies here (e.g. development
+    # dependencies). You can install these using the following syntax,
+    # for example:
+    # $ pip install -e .[dev,test]
+    extras_require={
+        'dev': ['check-manifest'],
+        'test': ['coverage', 'pytest'],
+    },
+
+    # If there are data files included in your packages that need to be
+    # installed, specify them here.  If using Python 2.6 or less, then these
+    # have to be included in MANIFEST.in as well.
+    # package_data={
+    #     'sample': ['package_data.dat'],
+    # },
+
+    # Although 'package_data' is the preferred approach, in some case you may
+    # need to place data files outside of your packages. See:
+    # http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files # noqa
+    # In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
+    # data_files=[('my_data', ['data/data_file'])],
+
+    # To provide executable scripts, use entry points in preference to the
+    # "scripts" keyword. Entry points provide cross-platform support and allow
+    # pip to create the appropriate form of executable for the target platform.
+    entry_points={
+        'console_scripts': [
+            'poc_modbus_server = poc_modbus_server:main',
+        ],
+    },
+)
diff --git a/poc_modbus_server/setup.py b/poc_modbus_server/setup.py
deleted file mode 100644
index eec2601..0000000
--- a/poc_modbus_server/setup.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import os
-
-from setuptools import setup, find_packages
-
-here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, 'README.md')) as f:
-    README = f.read()
-with open(os.path.join(here, 'CHANGES.md')) as f:
-    CHANGES = f.read()
-
-requires = [
-    'pymongo',
-    'pymodbus',
-    'cryptography',
-    'pyasn1',
-]
-
-tests_require = [
-    'pytest',
-]
-
-setup(
-    name='poc_modbus_server',
-    version='0.0',
-    description='Modbus TCP Server for Henry POC',
-    long_description=README + '\n\n' + CHANGES,
-    classifiers=[
-        'Programming Language :: Python',
-        'Framework :: Pyramid',
-        'Topic :: Internet :: WWW/HTTP',
-        'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
-    ],
-    author='',
-    author_email='',
-    url='',
-    keywords='web',
-    packages=find_packages(),
-    include_package_data=True,
-    zip_safe=False,
-    extras_require={
-        'testing': tests_require,
-    },
-    install_requires=requires,
-    entry_points={
-        'console_scripts': [
-            'poc_modbus_server = poc_modbus_server.__init__:main',
-        ],
-    },
-)
diff --git a/poc_scraper/CHANGES.md b/poc_scraper/poc_scraper/CHANGES.md
similarity index 100%
rename from poc_scraper/CHANGES.md
rename to poc_scraper/poc_scraper/CHANGES.md
diff --git a/poc_scraper/README.md b/poc_scraper/poc_scraper/README.md
similarity index 100%
rename from poc_scraper/README.md
rename to poc_scraper/poc_scraper/README.md
diff --git a/poc_scraper/__init__.py b/poc_scraper/poc_scraper/__init__.py
similarity index 100%
rename from poc_scraper/__init__.py
rename to poc_scraper/poc_scraper/__init__.py
diff --git a/poc_scraper/analog.json b/poc_scraper/poc_scraper/analog.json
similarity index 100%
rename from poc_scraper/analog.json
rename to poc_scraper/poc_scraper/analog.json
diff --git a/poc_scraper/arraylist.json b/poc_scraper/poc_scraper/arraylist.json
similarity index 100%
rename from poc_scraper/arraylist.json
rename to poc_scraper/poc_scraper/arraylist.json
diff --git a/poc_scraper/digital.json b/poc_scraper/poc_scraper/digital.json
similarity index 100%
rename from poc_scraper/digital.json
rename to poc_scraper/poc_scraper/digital.json
diff --git a/poc_scraper/plc_to_mongo.py b/poc_scraper/poc_scraper/plc_to_mongo.py
similarity index 100%
rename from poc_scraper/plc_to_mongo.py
rename to poc_scraper/poc_scraper/plc_to_mongo.py
diff --git a/poc_scraper/setup.py b/poc_scraper/poc_scraper/setup.py
similarity index 100%
rename from poc_scraper/setup.py
rename to poc_scraper/poc_scraper/setup.py
diff --git a/test.py b/test.py
index 678d442..2c1a325 100644
--- a/test.py
+++ b/test.py
@@ -23,7 +23,7 @@ log.setLevel(logging.INFO)
 # ---------------------------------------------------------------------------#
 # Modbus Client Setup
 # ---------------------------------------------------------------------------#
-modbus_client = ModbusClient('localhost', port=5020)
+modbus_client = ModbusClient('localhost', port=502)
 
 # ---------------------------------------------------------------------------#
 # Mongo DB Setup