Moved around files that don't use pipeline