Changed directory structure to psr-4