Refactored base conversion classes and tests into new package
Shorten service implementation