Add structure for GOOS review