Fixed library name and subfolder