Moved schemas to allow for output.json schema