cgctl moved back into build system