Sorted stuff, fixed LIBDIR stuff.