OAIPMHtypExtractor refactoring