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

This reverts commit fd6e39246db542b243385d465684273cab6ce305.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the FremenGrid sub directory