clean up buildout and move to more specific files