message refactoring, template moving