Switch to psr-4 with vendor name