move to psr-4, refactored locator