Major catalog and layer loading refactor.