Removed excess in focus renewal
Added files that were renamed in previous changes
Added project files and a few other corrections to repo