Fix issue after converters refactoring
Created services module
Cleaned imports