merged related classes into mudules