Updating .gitignore, modifying folder structure