Removed engine.*, and updated the message.h header file to be more clean
Changed the interface to message passing to slim down code