Reorganized protocol modules