Refactor GenreMap and implementing classes to avoid name clash with class(es) in main atlas repo.