Moved Protocol classes to scuba