Make sdist work
Refactor again