Change subscriber callback to MessageEvent format.
Rearranged folders