Module renaming
Combine some classes