Changed mach_inject to use a submodule and cleaned up build system