diff --git a/katapayadi/expose.py → libindic/katapayadi/expose.py b/katapayadi/expose.py → libindic/katapayadi/expose.py
@@ -1,8 +1,9 @@
 from .core import Katapayadi
 
+
 def katapayadi_getnumber(word):
     return Katapayadi().get_number(word)
 
+
 def getnumber():
     return [katapayadi_getnumber, str, int]
-
diff --git a/katapayadi/templates/katapayadi.html → ...ndic/katapayadi/templates/katapayadi.html b/katapayadi/templates/katapayadi.html → ...ndic/katapayadi/templates/katapayadi.html
diff --git a/tests/__init__.py → libindic/katapayadi/tests/__init__.py b/tests/__init__.py → libindic/katapayadi/tests/__init__.py
diff --git a/libindic/katapayadi/tests/test_katapayadi.py b/libindic/katapayadi/tests/test_katapayadi.py
@@ -0,0 +1,31 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+
+from testtools import TestCase
+
+from .. import Katapayadi
+
+
+class KatapayadiTest(TestCase):
+
+    def setUp(self):
+        super(KatapayadiTest, self).setUp()
+        self.katapayadi = Katapayadi()
+
+    def test_katapayadi(self):
+        self.assertEqual(self.katapayadi.get_number(u"കമല"), 351)
+        self.assertEqual(self.katapayadi.get_number(u"വ്യാജം"), 81)
+        self.assertEqual(self.katapayadi.get_number(u"സത്യം"), 17)
+        self.assertEqual(self.katapayadi.get_number(u"കൃഷ്ണ"), 51)
+        self.assertEqual(self.katapayadi.get_number(u"ലീല"), 33)
+        self.assertEqual(self.katapayadi.get_number(u"മനസ്സു്"), 705)
+        self.assertEqual(self.katapayadi.get_number(u"കാമം"), 51)
+        self.assertEqual(self.katapayadi.get_number(u"മോക്ഷം"), 65)
+
+    def test_swarasthana(self):
+        self.assertEqual(self.katapayadi.get_swarasthanas(1)[2], "Ga1")
+        self.assertEqual(self.katapayadi.get_swarasthanas(2)[2], "Ga1")
+        self.assertEqual(self.katapayadi.get_swarasthanas(3)[2], "Ga1")
+        self.assertEqual(self.katapayadi.get_swarasthanas(4)[2], "Ga1")
+        self.assertEqual(self.katapayadi.get_swarasthanas(5)[2], "Ga1")
+        self.assertEqual(self.katapayadi.get_swarasthanas(6)[2], "Ga1")
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,2 @@
+indicsyllabifier
+silpa_common
diff --git a/setup.cfg b/setup.cfg
@@ -1,11 +1,11 @@
 [metadata]
-name = katapayadi
+name = libindic-katapayadi
 author = Santhosh Thottingal
 author-email = santhosh.thottingal@gmail.com
 summary = Decode katapayadi number system
 license = LGPL-3.0
 description-file =
-  README.rst
+  README.md
 home-page = https://libindic.org/katapayadi
 requires-python = >=2.7
 classifier =
@@ -18,8 +18,12 @@ classifier =
   Programming Language :: Python
 
 [files]
-packages =
- katapayadi
+namespace_packages = libindic
+packages = libindic
+
+[build-sphinx]
+all_files = 1
+source-dir = docs
 
 [entry_points]
 libindic.api.rest =

diff --git a/setup.py b/setup.py
@@ -5,4 +5,3 @@
     setup_requires=['pbr'],
     pbr=True
 )
-
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -0,0 +1,6 @@
+testrepository
+python-subunit
+flake8
+mccabe
+coverage
+coveralls
diff --git a/tests/katapayadi_test.py b/tests/katapayadi_test.py
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,20 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py35, py27, pep8
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+    -rrequirements.txt
+    -rtest-requirements.txt
+
+[testenv:pep8]
+deps=
+  -rrequirements.txt
+  -rtest-requirements.txt
+commands=
+  flake8 libindic