New build structure. All working except system build.