Refactored modules to use core message queue where appropriate.
Marked todo task as done.