Reorganized library folder structure