Splitting some modules into smaller ones.