fixed include directories
moved project files
moved folders
Merge branch 'develop'