Removed unused using directives and references. Also put using directives in namespace.