Updated to PSR-4.

Cleaner commit than my other PR. Used `git mv` as well.