Renamed and removed unnecessary files