Updated namespaces, sorted usings