Harmonize and enhance Modules layout : refs #475