mv hedrs to src dir - fr more conven
mv geometry for true place
repaired cmake for turn test