Minor Fixes And PSR-4 Namespacing

I'm not certain I haven't broken something, so I am waiting to see what travis makes of this pull...