module refactoring, lobby work