Updated to a pypi package format