Reorganize library directory structure