Some cleanups post move to subproject structure.