start an incremental refactoring towards a better content service