moved some things around
updated gitignore