Rename protocol modules to reflect purpose instead of name.
Fix import.