Renamed files
Setup should now work