Split classes into seperate modules