Changing everything to be in setuptools format