[REF] Avoid multiple classes with the same name (that prevents for instance optimizing teh composer class loader), refactor to align with PSR-4 loading style