restructured namespaces and added entities linkikg