Try to fix folder and git does not exist issue

## Not ready to be merged yet

Address #1