Change to new build system