Reorganize libraries