reorganization and begin of User module