Restructure generating system for new build system