diff --git a/templates/skin/developer/emails/english/notify.blog_invite_new.tpl b/templates/skin/developer/emails/en/notify.blog_invite_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.blog_invite_new.tpl
rename to templates/skin/developer/emails/en/notify.blog_invite_new.tpl
diff --git a/templates/skin/developer/emails/english/notify.comment_new.tpl b/templates/skin/developer/emails/en/notify.comment_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.comment_new.tpl
rename to templates/skin/developer/emails/en/notify.comment_new.tpl
diff --git a/templates/skin/developer/emails/english/notify.comment_reply.tpl b/templates/skin/developer/emails/en/notify.comment_reply.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.comment_reply.tpl
rename to templates/skin/developer/emails/en/notify.comment_reply.tpl
diff --git a/templates/skin/developer/emails/english/notify.invite.tpl b/templates/skin/developer/emails/en/notify.invite.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.invite.tpl
rename to templates/skin/developer/emails/en/notify.invite.tpl
diff --git a/templates/skin/developer/emails/english/notify.reactivation.tpl b/templates/skin/developer/emails/en/notify.reactivation.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.reactivation.tpl
rename to templates/skin/developer/emails/en/notify.reactivation.tpl
diff --git a/templates/skin/developer/emails/english/notify.registration.tpl b/templates/skin/developer/emails/en/notify.registration.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.registration.tpl
rename to templates/skin/developer/emails/en/notify.registration.tpl
diff --git a/templates/skin/developer/emails/english/notify.registration_activate.tpl b/templates/skin/developer/emails/en/notify.registration_activate.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.registration_activate.tpl
rename to templates/skin/developer/emails/en/notify.registration_activate.tpl
diff --git a/templates/skin/developer/emails/english/notify.reminder_code.tpl b/templates/skin/developer/emails/en/notify.reminder_code.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.reminder_code.tpl
rename to templates/skin/developer/emails/en/notify.reminder_code.tpl
diff --git a/templates/skin/developer/emails/english/notify.reminder_password.tpl b/templates/skin/developer/emails/en/notify.reminder_password.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.reminder_password.tpl
rename to templates/skin/developer/emails/en/notify.reminder_password.tpl
diff --git a/templates/skin/developer/emails/english/notify.talk_comment_new.tpl b/templates/skin/developer/emails/en/notify.talk_comment_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.talk_comment_new.tpl
rename to templates/skin/developer/emails/en/notify.talk_comment_new.tpl
diff --git a/templates/skin/developer/emails/english/notify.talk_new.tpl b/templates/skin/developer/emails/en/notify.talk_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.talk_new.tpl
rename to templates/skin/developer/emails/en/notify.talk_new.tpl
diff --git a/templates/skin/developer/emails/english/notify.topic_new.tpl b/templates/skin/developer/emails/en/notify.topic_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.topic_new.tpl
rename to templates/skin/developer/emails/en/notify.topic_new.tpl
diff --git a/templates/skin/developer/emails/english/notify.user_changemail_from.tpl b/templates/skin/developer/emails/en/notify.user_changemail_from.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.user_changemail_from.tpl
rename to templates/skin/developer/emails/en/notify.user_changemail_from.tpl
diff --git a/templates/skin/developer/emails/english/notify.user_changemail_to.tpl b/templates/skin/developer/emails/en/notify.user_changemail_to.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.user_changemail_to.tpl
rename to templates/skin/developer/emails/en/notify.user_changemail_to.tpl
diff --git a/templates/skin/developer/emails/english/notify.user_friend_new.tpl b/templates/skin/developer/emails/en/notify.user_friend_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.user_friend_new.tpl
rename to templates/skin/developer/emails/en/notify.user_friend_new.tpl
diff --git a/templates/skin/developer/emails/english/notify.wall.new.tpl b/templates/skin/developer/emails/en/notify.wall.new.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.wall.new.tpl
rename to templates/skin/developer/emails/en/notify.wall.new.tpl
diff --git a/templates/skin/developer/emails/english/notify.wall.reply.tpl b/templates/skin/developer/emails/en/notify.wall.reply.tpl
similarity index 100%
rename from templates/skin/developer/emails/english/notify.wall.reply.tpl
rename to templates/skin/developer/emails/en/notify.wall.reply.tpl
diff --git a/templates/skin/developer/emails/russian/email.blog_invite_new.tpl b/templates/skin/developer/emails/ru/email.blog_invite_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.blog_invite_new.tpl
rename to templates/skin/developer/emails/ru/email.blog_invite_new.tpl
diff --git a/templates/skin/developer/emails/russian/email.comment_new.tpl b/templates/skin/developer/emails/ru/email.comment_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.comment_new.tpl
rename to templates/skin/developer/emails/ru/email.comment_new.tpl
diff --git a/templates/skin/developer/emails/russian/email.comment_reply.tpl b/templates/skin/developer/emails/ru/email.comment_reply.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.comment_reply.tpl
rename to templates/skin/developer/emails/ru/email.comment_reply.tpl
diff --git a/templates/skin/developer/emails/russian/email.invite.tpl b/templates/skin/developer/emails/ru/email.invite.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.invite.tpl
rename to templates/skin/developer/emails/ru/email.invite.tpl
diff --git a/templates/skin/developer/emails/russian/email.reactivation.tpl b/templates/skin/developer/emails/ru/email.reactivation.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.reactivation.tpl
rename to templates/skin/developer/emails/ru/email.reactivation.tpl
diff --git a/templates/skin/developer/emails/russian/email.registration.tpl b/templates/skin/developer/emails/ru/email.registration.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.registration.tpl
rename to templates/skin/developer/emails/ru/email.registration.tpl
diff --git a/templates/skin/developer/emails/russian/email.registration_activate.tpl b/templates/skin/developer/emails/ru/email.registration_activate.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.registration_activate.tpl
rename to templates/skin/developer/emails/ru/email.registration_activate.tpl
diff --git a/templates/skin/developer/emails/russian/email.reminder_code.tpl b/templates/skin/developer/emails/ru/email.reminder_code.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.reminder_code.tpl
rename to templates/skin/developer/emails/ru/email.reminder_code.tpl
diff --git a/templates/skin/developer/emails/russian/email.reminder_password.tpl b/templates/skin/developer/emails/ru/email.reminder_password.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.reminder_password.tpl
rename to templates/skin/developer/emails/ru/email.reminder_password.tpl
diff --git a/templates/skin/developer/emails/russian/email.talk_comment_new.tpl b/templates/skin/developer/emails/ru/email.talk_comment_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.talk_comment_new.tpl
rename to templates/skin/developer/emails/ru/email.talk_comment_new.tpl
diff --git a/templates/skin/developer/emails/russian/email.talk_new.tpl b/templates/skin/developer/emails/ru/email.talk_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.talk_new.tpl
rename to templates/skin/developer/emails/ru/email.talk_new.tpl
diff --git a/templates/skin/developer/emails/russian/email.topic_new.tpl b/templates/skin/developer/emails/ru/email.topic_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.topic_new.tpl
rename to templates/skin/developer/emails/ru/email.topic_new.tpl
diff --git a/templates/skin/developer/emails/russian/email.user_changemail_from.tpl b/templates/skin/developer/emails/ru/email.user_changemail_from.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.user_changemail_from.tpl
rename to templates/skin/developer/emails/ru/email.user_changemail_from.tpl
diff --git a/templates/skin/developer/emails/russian/email.user_changemail_to.tpl b/templates/skin/developer/emails/ru/email.user_changemail_to.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.user_changemail_to.tpl
rename to templates/skin/developer/emails/ru/email.user_changemail_to.tpl
diff --git a/templates/skin/developer/emails/russian/email.user_friend_new.tpl b/templates/skin/developer/emails/ru/email.user_friend_new.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.user_friend_new.tpl
rename to templates/skin/developer/emails/ru/email.user_friend_new.tpl
diff --git a/templates/skin/developer/emails/russian/email.wall.new.tpl b/templates/skin/developer/emails/ru/email.wall.new.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.wall.new.tpl
rename to templates/skin/developer/emails/ru/email.wall.new.tpl
diff --git a/templates/skin/developer/emails/russian/email.wall.reply.tpl b/templates/skin/developer/emails/ru/email.wall.reply.tpl
similarity index 100%
rename from templates/skin/developer/emails/russian/email.wall.reply.tpl
rename to templates/skin/developer/emails/ru/email.wall.reply.tpl
diff --git a/templates/skin/synio/emails/english/notify.blog_invite_new.tpl b/templates/skin/synio/emails/en/notify.blog_invite_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.blog_invite_new.tpl
rename to templates/skin/synio/emails/en/notify.blog_invite_new.tpl
diff --git a/templates/skin/synio/emails/english/notify.comment_new.tpl b/templates/skin/synio/emails/en/notify.comment_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.comment_new.tpl
rename to templates/skin/synio/emails/en/notify.comment_new.tpl
diff --git a/templates/skin/synio/emails/english/notify.comment_reply.tpl b/templates/skin/synio/emails/en/notify.comment_reply.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.comment_reply.tpl
rename to templates/skin/synio/emails/en/notify.comment_reply.tpl
diff --git a/templates/skin/synio/emails/english/notify.invite.tpl b/templates/skin/synio/emails/en/notify.invite.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.invite.tpl
rename to templates/skin/synio/emails/en/notify.invite.tpl
diff --git a/templates/skin/synio/emails/english/notify.reactivation.tpl b/templates/skin/synio/emails/en/notify.reactivation.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.reactivation.tpl
rename to templates/skin/synio/emails/en/notify.reactivation.tpl
diff --git a/templates/skin/synio/emails/english/notify.registration.tpl b/templates/skin/synio/emails/en/notify.registration.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.registration.tpl
rename to templates/skin/synio/emails/en/notify.registration.tpl
diff --git a/templates/skin/synio/emails/english/notify.registration_activate.tpl b/templates/skin/synio/emails/en/notify.registration_activate.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.registration_activate.tpl
rename to templates/skin/synio/emails/en/notify.registration_activate.tpl
diff --git a/templates/skin/synio/emails/english/notify.reminder_code.tpl b/templates/skin/synio/emails/en/notify.reminder_code.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.reminder_code.tpl
rename to templates/skin/synio/emails/en/notify.reminder_code.tpl
diff --git a/templates/skin/synio/emails/english/notify.reminder_password.tpl b/templates/skin/synio/emails/en/notify.reminder_password.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.reminder_password.tpl
rename to templates/skin/synio/emails/en/notify.reminder_password.tpl
diff --git a/templates/skin/synio/emails/english/notify.talk_comment_new.tpl b/templates/skin/synio/emails/en/notify.talk_comment_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.talk_comment_new.tpl
rename to templates/skin/synio/emails/en/notify.talk_comment_new.tpl
diff --git a/templates/skin/synio/emails/english/notify.talk_new.tpl b/templates/skin/synio/emails/en/notify.talk_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.talk_new.tpl
rename to templates/skin/synio/emails/en/notify.talk_new.tpl
diff --git a/templates/skin/synio/emails/english/notify.topic_new.tpl b/templates/skin/synio/emails/en/notify.topic_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.topic_new.tpl
rename to templates/skin/synio/emails/en/notify.topic_new.tpl
diff --git a/templates/skin/synio/emails/english/notify.user_changemail_from.tpl b/templates/skin/synio/emails/en/notify.user_changemail_from.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.user_changemail_from.tpl
rename to templates/skin/synio/emails/en/notify.user_changemail_from.tpl
diff --git a/templates/skin/synio/emails/english/notify.user_changemail_to.tpl b/templates/skin/synio/emails/en/notify.user_changemail_to.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.user_changemail_to.tpl
rename to templates/skin/synio/emails/en/notify.user_changemail_to.tpl
diff --git a/templates/skin/synio/emails/english/notify.user_friend_new.tpl b/templates/skin/synio/emails/en/notify.user_friend_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.user_friend_new.tpl
rename to templates/skin/synio/emails/en/notify.user_friend_new.tpl
diff --git a/templates/skin/synio/emails/english/notify.wall.new.tpl b/templates/skin/synio/emails/en/notify.wall.new.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.wall.new.tpl
rename to templates/skin/synio/emails/en/notify.wall.new.tpl
diff --git a/templates/skin/synio/emails/english/notify.wall.reply.tpl b/templates/skin/synio/emails/en/notify.wall.reply.tpl
similarity index 100%
rename from templates/skin/synio/emails/english/notify.wall.reply.tpl
rename to templates/skin/synio/emails/en/notify.wall.reply.tpl
diff --git a/templates/skin/synio/emails/russian/email.blog_invite_new.tpl b/templates/skin/synio/emails/ru/email.blog_invite_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.blog_invite_new.tpl
rename to templates/skin/synio/emails/ru/email.blog_invite_new.tpl
diff --git a/templates/skin/synio/emails/russian/email.comment_new.tpl b/templates/skin/synio/emails/ru/email.comment_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.comment_new.tpl
rename to templates/skin/synio/emails/ru/email.comment_new.tpl
diff --git a/templates/skin/synio/emails/russian/email.comment_reply.tpl b/templates/skin/synio/emails/ru/email.comment_reply.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.comment_reply.tpl
rename to templates/skin/synio/emails/ru/email.comment_reply.tpl
diff --git a/templates/skin/synio/emails/russian/email.invite.tpl b/templates/skin/synio/emails/ru/email.invite.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.invite.tpl
rename to templates/skin/synio/emails/ru/email.invite.tpl
diff --git a/templates/skin/synio/emails/russian/email.reactivation.tpl b/templates/skin/synio/emails/ru/email.reactivation.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.reactivation.tpl
rename to templates/skin/synio/emails/ru/email.reactivation.tpl
diff --git a/templates/skin/synio/emails/russian/email.registration.tpl b/templates/skin/synio/emails/ru/email.registration.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.registration.tpl
rename to templates/skin/synio/emails/ru/email.registration.tpl
diff --git a/templates/skin/synio/emails/russian/email.registration_activate.tpl b/templates/skin/synio/emails/ru/email.registration_activate.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.registration_activate.tpl
rename to templates/skin/synio/emails/ru/email.registration_activate.tpl
diff --git a/templates/skin/synio/emails/russian/email.reminder_code.tpl b/templates/skin/synio/emails/ru/email.reminder_code.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.reminder_code.tpl
rename to templates/skin/synio/emails/ru/email.reminder_code.tpl
diff --git a/templates/skin/synio/emails/russian/email.reminder_password.tpl b/templates/skin/synio/emails/ru/email.reminder_password.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.reminder_password.tpl
rename to templates/skin/synio/emails/ru/email.reminder_password.tpl
diff --git a/templates/skin/synio/emails/russian/email.talk_comment_new.tpl b/templates/skin/synio/emails/ru/email.talk_comment_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.talk_comment_new.tpl
rename to templates/skin/synio/emails/ru/email.talk_comment_new.tpl
diff --git a/templates/skin/synio/emails/russian/email.talk_new.tpl b/templates/skin/synio/emails/ru/email.talk_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.talk_new.tpl
rename to templates/skin/synio/emails/ru/email.talk_new.tpl
diff --git a/templates/skin/synio/emails/russian/email.topic_new.tpl b/templates/skin/synio/emails/ru/email.topic_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.topic_new.tpl
rename to templates/skin/synio/emails/ru/email.topic_new.tpl
diff --git a/templates/skin/synio/emails/russian/email.user_changemail_from.tpl b/templates/skin/synio/emails/ru/email.user_changemail_from.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.user_changemail_from.tpl
rename to templates/skin/synio/emails/ru/email.user_changemail_from.tpl
diff --git a/templates/skin/synio/emails/russian/email.user_changemail_to.tpl b/templates/skin/synio/emails/ru/email.user_changemail_to.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.user_changemail_to.tpl
rename to templates/skin/synio/emails/ru/email.user_changemail_to.tpl
diff --git a/templates/skin/synio/emails/russian/email.user_friend_new.tpl b/templates/skin/synio/emails/ru/email.user_friend_new.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.user_friend_new.tpl
rename to templates/skin/synio/emails/ru/email.user_friend_new.tpl
diff --git a/templates/skin/synio/emails/russian/email.wall.new.tpl b/templates/skin/synio/emails/ru/email.wall.new.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.wall.new.tpl
rename to templates/skin/synio/emails/ru/email.wall.new.tpl
diff --git a/templates/skin/synio/emails/russian/email.wall.reply.tpl b/templates/skin/synio/emails/ru/email.wall.reply.tpl
similarity index 100%
rename from templates/skin/synio/emails/russian/email.wall.reply.tpl
rename to templates/skin/synio/emails/ru/email.wall.reply.tpl