Fixed issue with project files
Fixed latest refactoring issues.