Move converter to own package.
Moved
Clean up a bit more