Complete move of packages to map.jija