Restructure buildout files, to make future changes easier.