re-structure for pypi