buildout and config refactoring