Tracking master + Cargo support

* Tracking master
* Cargo support
* 4 space indentation
* Moved tests into the same file and under it's own module.
* Updated tooling to use Cargo