lib reorganized