Renaming each field support
Reorganize packages for protocols