Changing folder structure to support upload to PyPI