Fixed folders?

I fixed them and they load correctly, but the changes arn't appearing in
the git.
Cleaned up transition code and bug fix
Fixed NPC crash
New vector version of usa map
Merge