Renamed some stuff and updated gitignore