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