Add revamped files to master