MANME-373, Update JavaDoc, merge Mapping and MappingLibrary together