Give messenger and protocol engine each their own line in the download table
Use the same scheme for dividing components everywhere