Reorganised maps and vmap files