more refactoring mishaps. PSR-4 works, but is annoying with class/file names