Reorg for setuptools install.