Moves messages in separate namespace
Fixes typo
Merge branch 'feature/message' into develop