Reorganizing and adding .gitignore