sort out build system