Module refactoring + tabs module work