Refactor

Metadata organized better, myMessages and otherMessages are refactored,
some adjusments here and there, service reference updated