refactoring buildout