Protocol refactors
Updated version
Centralize everything in cludje namespace