After the upgrade to El Capitan, Photos crashes
Create a new library, and import all of the other images from the Masters folder. Photos allows you to import images in sub folders, so dragging the masters folder should work.