updated .gitignore, moved around some server files