some renames, removed unnecessary gitignore entries