Reorganise library a bit.