more classes to modules