Update to 3.0 build system