Moving Tests into main folder and updating .gitignore