Renames and cleanup
Updating .gitignore