Refactor ingest YAML and rake task.