#14 Refactor structure Group->Inbox