buildout restructuring