Correct project setup

now project compiles
more refactoring