Convert to PSR-4 and composer