Git Formatting

Updated .gitignore and moved some files around.