Updates due to switching to PSR-4.