move more classes in better module