Change to PSR-4; workaround some Application package issues.