changed package bbk to discovery; isolated msg in Protocol classes
changed package bbk to discovery; isolated msg in Protocol classes