Revert "Trimmed the branch to only the osm_cartography sub directory"

This reverts commit 2295f9edc5943a2c8ce6f193d5b7f384091146c2.
Rebase from 'upstream'
Trimmed the branch to only the osm_cartography sub directory