Flatten a bit the module hierarchy.