Reordered packages to avoid problems with hyperref.sty and cleveref.sty. \addbibresource now in individual document headers. Simplified handling of separate figure files.