#31. Reverted to PSR-4 now that other issues are addressed.