[REFACTOR] - moved Messages class.