+ Move message and block to separated files.