Renamed and removed some sloppy files