[TASK] Unify layout of tables in submodules