Restructure to PSR-4