Changed folder structure to PSR-0