Moved Messages to separate package