Refactored messaging modules into item package