Renamed and cleaned up several files.