Changed the structure to be more suitable to a package for uploading to PyPI.