Refactor buildout