/include and /lib reorganized a little bit