Upgrading folder structure to PSR-4