Re-organize scheme specs