PSR prep

Here's some changes preparing the code for PSR standards and namespaces.  Let the fun begin!