Re: library reorganisation