Moved transformer to own package
refactored classes to subpackages