Changed to a standard setuptools package layout