diff --git a/bin/SimpleWebPage b/bin/SimpleWebPage
index 8912613..607aa80 120000
--- a/bin/SimpleWebPage
+++ b/bin/SimpleWebPage
@@ -1 +1 @@
-../web/SimpleWebPage.py
\ No newline at end of file
+../py-packages/SimpleWebPage/simplewebpage/__init__.py
\ No newline at end of file
diff --git a/py-packages/Makefile b/py-packages/Makefile
new file mode 100644
index 0000000..25da4a7
--- /dev/null
+++ b/py-packages/Makefile
@@ -0,0 +1,25 @@
+.PHONY: help
+
+help: ## *:･ﾟ✧*:･ﾟ✧ This help *:･ﾟ✧*:･ﾟ✧
+	@printf "\033[36;1m  %14s  \033[0;32;1m %s\033[0m\n" Target Description
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
+		awk ' \
+			BEGIN {FS = ":.*?## "}; \
+			{ if ( $$1 != "-") { \
+			    printf "\033[31;1;40m[ \033[36;1;40m%14s \033[31;1;40m]\033[0;32;1m %s\033[0m\n", $$1, $$2 \
+			   } else { \
+			    printf "               \033[0;33;1m=^= %-25s =^=\033[0m\n", $$2 \
+			  } \
+			} \
+		'
+
+clean: ## Clean build and .egg folder in py modules
+	rm -vr */build/ */*.egg-info
+
+
+pipx: ## Install all packages with pipx
+	for module in *; do if [[ -f $module/setup.py ]]; then pipx install $module; fi; done
+
+
+foo:
+	pass
diff --git a/py-packages/SimpleWebPage/setup.py b/py-packages/SimpleWebPage/setup.py
new file mode 100644
index 0000000..21d8844
--- /dev/null
+++ b/py-packages/SimpleWebPage/setup.py
@@ -0,0 +1,25 @@
+from distutils.core import setup
+
+def version_reader(path):
+    for line in open(path,"rt").read(1024).split("\n"):
+        if line.startswith("VERSION"):
+            return line.split("=")[1].strip().replace('"',"")
+
+version = version_reader(os.path.join("simplewebpage","__init__.py"))
+setup(
+    name="SimpleWebPage",
+    packages=["simplewebpage"],
+    version=version,
+    description="HTML file index generator.",
+    author="Ville Rantanen",
+    author_email="ville.q.rantanen@gmail.com",
+    keywords=["HTML", "generator"],
+    entry_points={
+        "console_scripts": [
+            "SimpleWebPage=simplewebpage:main",
+        ],
+    },
+    install_requires = [
+        'markdown>=3.3.4'
+    ]
+)
diff --git a/web/SimpleWebPage.py b/py-packages/SimpleWebPage/simplewebpage/__init__.py
similarity index 99%
rename from web/SimpleWebPage.py
rename to py-packages/SimpleWebPage/simplewebpage/__init__.py
index f9a5c35..b79c7dc 100755
--- a/web/SimpleWebPage.py
+++ b/py-packages/SimpleWebPage/simplewebpage/__init__.py
@@ -1006,7 +1006,9 @@ def sizeof(num):
             return "%3.1f %s" % (num, x)
         num /= 1024.0
 
-
-if __name__ == "__main__":
+def main():
     opts = setup()
     generate_index(opts)
+
+if __name__ == "__main__":
+    main()
diff --git a/tsv/lib/TSVFilter/TSVFilter/__init__.py b/py-packages/TSVFilter/TSVFilter/__init__.py
similarity index 100%
rename from tsv/lib/TSVFilter/TSVFilter/__init__.py
rename to py-packages/TSVFilter/TSVFilter/__init__.py
diff --git a/tsv/lib/TSVFilter/TSVFilter/filter.py b/py-packages/TSVFilter/TSVFilter/filter.py
similarity index 96%
rename from tsv/lib/TSVFilter/TSVFilter/filter.py
rename to py-packages/TSVFilter/TSVFilter/filter.py
index 4b281ba..a5bbb69 100644
--- a/tsv/lib/TSVFilter/TSVFilter/filter.py
+++ b/py-packages/TSVFilter/TSVFilter/filter.py
@@ -4,6 +4,8 @@ import os
 import re
 from argparse import ArgumentParser
 
+__version__ = "1.0"
+
 
 class TSVFilter:
     def __init__(self):
@@ -16,6 +18,8 @@ class TSVFilter:
     def get_options(self):
 
         parser = ArgumentParser()
+        # ~ parser.add_argument('--version', action='version', version=open(os.path.join(os.path.dirname(__file__),"VERSION"), "rt").read())
+        parser.add_argument("--version", action="version", version=__version__)
         parser.add_argument(
             "-f",
             action="store",
diff --git a/py-packages/TSVFilter/setup.py b/py-packages/TSVFilter/setup.py
new file mode 100644
index 0000000..6dcdf49
--- /dev/null
+++ b/py-packages/TSVFilter/setup.py
@@ -0,0 +1,24 @@
+from distutils.core import setup
+
+
+def version_reader(path):
+    for line in open(path, "rt").read(1024).split("\n"):
+        if line.startswith("__version__"):
+            return line.split("=")[1].strip().replace('"', "")
+
+
+version = version_reader(os.path.join("TSVFilter", "filter.py"))
+setup(
+    name="TSVFilter",
+    packages=["TSVFilter"],
+    version=version,
+    description="TSV column filter.",
+    author="Ville Rantanen",
+    author_email="ville.q.rantanen@gmail.com",
+    keywords=["TSV", "data"],
+    entry_points={
+        "console_scripts": [
+            "TSVFilter=TSVFilter:main",
+        ],
+    },
+)
diff --git a/tsv/lib/TSVFilter/setup.py b/tsv/lib/TSVFilter/setup.py
deleted file mode 100644
index bcf9034..0000000
--- a/tsv/lib/TSVFilter/setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from distutils.core import setup
-setup(
-  name = 'TSVFilter',
-  packages = ['TSVFilter'],
-  version = '1.0',
-  description = 'TSV column filter.',
-  author = 'Ville Rantanen',
-  author_email = 'ville.q.rantanen@gmail.com',
-  keywords = ['TSV', 'data'],
-  entry_points = {
-    "console_scripts": [
-        "TSVFilter=TSVFilter:main",
-    ],
-  },
-)