Renamed some files, more planned opt features.