Made portable and independent of rutils.
In previous commit forgot to add files)