updating to psr4, etc., etc.