Migrate to new build system