removed usings and fixed namespaces