Fix namespaces , simplify gengo connector