Consistent organization of modules