Renamed namespaces, usings added;