Tweaks to project layout for setuptools