All tests passing again
Added rust.mk submodule, refactoring