Change fold mappings
Update submodules