Updates for PSR-4
Merge pull request #1017 from ADmad/3.0-psr4

Updates for PSR-4