Moved usings into namespaces/added linebreak