Updated to match the new project structure
Merge branch 'master' of github.com:SCI-Utah/cnome