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

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