Renamed some stuff.
Fixed hardcoded files paths for files that had been renamed.