Refactor 'build system' for MCI