Changed directory structure to PSR-4