Reordered dirs to trim the fat PSR-4 allows.

Rearranged dirs to remove duplicate, PSR-4, handled namespace placeholders.  Renamed tests to test.