Renamed files and removed windows stuff