Restructure buildout