Restore Project files, and restore Guy's changes