Folder rename
Fix .gitignore for the new folder
Fixes for renamed folder