PSR-4, retaining original folder structure

PSR-0 is deprecated, so we should use PSR-4. For BC, I've retained the original folder structure.