Reorganize library structure