Move naturalities to naturality modules