Renamed files and added to non 3rd party original files