do some reshuffling
Change over to setuptools