Lib reorganization