Cleaned up code/structure somewhat.

Rearranged test namespaces.
Removed/sorted many usings.
Gave in to the dark side of the force....nooooo, I didn't.