refactor ContentImporter, add ContentService