Initial checkin of file-based catalog.  API tweaks.