started to refactor and cleanup the code for forwarding and demuxing among protocols