Rearangement of using namespaces