updated gitignore and moved files around