Complete mapping of all entities
Refactoring of mapping

Added extracted protocol-link for procedure elements
Ready to merge with master