refactor structure and add user-in-classroom