Moved some files, updated gitignore
Updated gitignore
Moved some files around