Convert some test folders to follow PSR-4