Fixing new namespace and fix old bad .cpp include ..
Merge pull request #147 from kerautret/FixNameSpaceFunctors

Fixing new namespace and fix old bad .cpp include ..