#193 Using Statement Cleanup - Part 1 - Organize

This resolves half of #193.

I'll leave part 2 (removing unneeded using statements) for someone else that has Resharper installed.

Generated using https://gist.github.com/rlabrecque/10949932 under Python3