Updated structure to psr-4