Restructuring for pypi