change Message folder to be more descriptive to Handler