Flatten a bit the module hierarchy to make the doc look pretier.

There are still some top-level modules that should be merged.