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

This reverts commit 8631233dc9fb152984959d3517de23b59b2c3ec8.
Rebase from 'upstream'
Trimmed the branch to only the rtt_geometry sub directory