diff --git a/.gitignore b/.gitignore
index 93526df..e9f2fd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,11 @@
 venv/
 __pycache__/
+.idea/
+bin/
+deb_dist/
+dist/
+include/
+lib/
+NotePostCLI-*.tar.gz
+share/
+NotePostCLI.egg-info/
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a940118..6c87862 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7e2ff7f2-75de-431f-9457-e0d648b65015" name="Default Changelist" comment="" />
+    <list default="true" id="7e2ff7f2-75de-431f-9457-e0d648b65015" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/api.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/config.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/notepost.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/termcolors.py" beforeDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -11,43 +18,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/notepost.py">
+        <entry file="file://$PROJECT_DIR$/setup.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="689">
-              <caret line="183" column="18" lean-forward="true" selection-start-line="183" selection-start-column="18" selection-end-line="183" selection-end-column="18" />
-              <folding>
-                <element signature="e#24#39#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/termcolors.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="19" column="22" selection-start-line="19" selection-start-column="22" selection-end-line="19" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/api.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="11" column="56" selection-start-line="11" selection-start-column="56" selection-end-line="11" selection-end-column="56" />
-              <folding>
-                <element signature="e#24#35#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="4" column="9" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
+            <state relative-caret-position="375">
+              <caret line="26" selection-start-line="26" selection-end-line="26" />
             </state>
           </provider>
         </entry>
@@ -163,7 +137,6 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="4" y="0" width="1912" height="1038" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18075491" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -194,6 +167,16 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/note.class.py" />
+    <entry file="file://$PROJECT_DIR$/notepost.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2640">
+          <caret line="183" column="18" lean-forward="true" selection-start-line="183" selection-start-column="18" selection-end-line="183" selection-end-column="18" />
+          <folding>
+            <element signature="e#24#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/termcolors.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="285">
@@ -201,16 +184,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/setup.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="585">
-          <caret line="39" column="75" selection-start-line="39" selection-start-column="75" selection-end-line="39" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/api.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
+        <state relative-caret-position="120">
           <caret line="11" column="56" selection-start-line="11" selection-start-column="56" selection-end-line="11" selection-end-column="56" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
@@ -225,13 +201,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/notepost.py">
+    <entry file="file://$PROJECT_DIR$/setup.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="689">
-          <caret line="183" column="18" lean-forward="true" selection-start-line="183" selection-start-column="18" selection-end-line="183" selection-end-column="18" />
-          <folding>
-            <element signature="e#24#39#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="375">
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
         </state>
       </provider>
     </entry>
diff --git a/README.md b/README.md
index 2901873..0b886a8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 NotePostCLI
 ===========
 
-A simple Python-based terminal app for using NotePost.
+A simple Python terminal app for using NotePost.
diff --git a/notepostcli/__init__.py b/notepostcli/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/api.py b/notepostcli/api.py
similarity index 74%
rename from api.py
rename to notepostcli/api.py
index 48e0b61..0250d14 100644
--- a/api.py
+++ b/notepostcli/api.py
@@ -1,5 +1,9 @@
 #!/usr/bin/env python3
 
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import i18n
 import requests
 
diff --git a/config.py b/notepostcli/config.py
similarity index 87%
rename from config.py
rename to notepostcli/config.py
index 9ddbc11..73b38a0 100644
--- a/config.py
+++ b/notepostcli/config.py
@@ -1,5 +1,9 @@
 #!/usr/bin/env python3
 
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import json
 import appdirs
 import os
diff --git a/notepost.py b/notepostcli/notepost.py
similarity index 92%
rename from notepost.py
rename to notepostcli/notepost.py
index 023ea84..275e205 100755
--- a/notepost.py
+++ b/notepostcli/notepost.py
@@ -1,5 +1,9 @@
 #!/usr/bin/env python3
 
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import tempfile
 import i18n
 import validators
@@ -128,7 +132,10 @@ def editmenu():
     if noteid.upper() == "M":
         clearscreen()
         return
-    editnote(notelist[noteid])
+    try:
+        editnote(notelist[noteid])
+    except KeyError:
+        print(i18n.t("Invalid selection."))
 
 
 def newnote():
@@ -174,7 +181,7 @@ def mainmenu():
 
 
 def main():
-    print("NotePostCLI v1.0")
+    print("NotePostCLI v0.1")
     if not checkconfig():
         print(i18n.t("No valid settings file found, running setup wizard."))
         firstsetup()
diff --git a/termcolors.py b/notepostcli/termcolors.py
similarity index 75%
rename from termcolors.py
rename to notepostcli/termcolors.py
index 5694b3c..b45e4f4 100644
--- a/termcolors.py
+++ b/notepostcli/termcolors.py
@@ -1,4 +1,9 @@
 #!/usr/bin/env python3
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 from math import sqrt
 
 
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 4888ec0..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-appdirs==1.4.3
-certifi==2018.11.29
-chardet==3.0.4
-decorator==4.3.0
-idna==2.8
-python-i18n==0.3.5
-requests==2.21.0
-six==1.12.0
-urllib3==1.24.1
-validators==0.12.3
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..3f15143
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+
+from setuptools import setup, find_packages
+setup(
+    name="NotePostCLI",
+    version="0.1",
+    packages=find_packages(),
+    install_requires=[
+        "appdirs==1.4.3",
+        "certifi==2018.11.29",
+        "chardet==3.0.4",
+        "decorator==4.3.0",
+        "idna==2.8",
+        "python-i18n==0.3.5",
+        "requests==2.21.0",
+        "six>=1.11.0",
+        "urllib3==1.24.1",
+        "validators==0.12.3"
+    ],
+    entry_points = {
+        'console_scripts' : ['notepost = notepostcli.notepost:main']
+    },
+    author="Netsyms Technologies",
+    author_email="opensource@netsyms.com",
+    license="MPL-2.0",
+    url="https://source.netsyms.com/Apps/NotePostCLI"
+)