New build system, split into two projects