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

This reverts commit a56a2898b672730335b3d439b6c2b05f04e75603.
Rebase from 'upstream'
Trimmed the branch to only the fremengrid sub directory