Converting to PSR-4
Reverting accidental commit.