rearranging to make pypi builds work
another round of restructuring the project