Move to psr-4 standard