Move protocols to their own namespace