Cleanup and reorganization of buildout files