changed some names, added stuff to .gitignore