Started refactoring (to get rid of camel routes)