Move converters to model namespace
Fix dependencies