Fix filename and path
Restore missing files