reorganize library structure