Upgrading to Fork v3.7.1

Deleted old folders