Add the execution time when dumping the message
Move some classes to new files