Changed namespaces structure