Added the buildout files after some cleanup/simplification