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

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