move to psr4 and minor adjustments

                   
|Q            |A  |
|---          |---|
|Bug Fix?     |n  |
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |n  |
|Fixed Tickets|   |
|License      |MIT|
|Doc PR       |   |
                   


Holding off on merge. I'll have a look at PSR-4 in the next day or two and check that I understand this.