Hmj xml mapper

Fixed previous merge issues which deleted many files.
added documentation + bug fixes