Moved usings within namespaces. General cleanup.