moved messages in appropriate file instead of templates