Organize the spec