Code commit with psr-4 refactor