Shifting things around due to PSR-4 compliance