Lib reorganized a little.