Moved protocol stuff into subfolder