Build restructure top level