Reorganize library structure slightly