diff --git a/src/build.xml b/src/build.xml
index 0b73a386..0f2eeef8 100644
--- a/src/build.xml
+++ b/src/build.xml
@@ -18,20 +18,20 @@
         <apply executable="mkdir" addsourcefile="false">
             <targetfile />
             <dirset dir=".">
-                <include name="${dialogs_styles_path}/*/handlebars_templates" />
+                <include name="${dialogs_styles_path}/*/templates_src/client_side" />
             </dirset>
-            <mapper type="glob" from="*/handlebars_templates" to="*/handlebars_templates_tmp" />
+            <mapper type="glob" from="*/templates_src/client_side" to="*/templates_compiled/client_side_tmp" />
         </apply>
 
         <!-- Flatten templates directory structure -->
         <apply executable="tools/flat_cp" force="true">
             <srcfile />
             <targetfile />
-            <arg value="handlebars_templates" />
+            <arg value="client_side" />
             <fileset dir=".">
-                <include name="${dialogs_styles_path}/*/handlebars_templates/**/*.handlebars" />
+                <include name="${dialogs_styles_path}/*/templates_src/client_side/**/*.handlebars" />
             </fileset>
-            <mapper type="regexp" from="^(.*)/handlebars_templates/(.*)$$" to="\1/handlebars_templates_tmp" />
+            <mapper type="regexp" from="^(.*)/templates_src/client_side/(.*)$$" to="\1/templates_compiled/client_side_tmp" />
         </apply>
 
         <echo>Compile templates</echo>
@@ -41,13 +41,13 @@
             <arg value="-f"/>
             <targetfile />
             <dirset dir=".">
-                <include name="${dialogs_styles_path}/*/handlebars_templates_tmp" />
+                <include name="${dialogs_styles_path}/*/templates_compiled/client_side_tmp" />
             </dirset>
-            <mapper type="glob" from="*/handlebars_templates_tmp" to="*/js/compiled/templates_tmp.js" />
+            <mapper type="glob" from="*/client_side_tmp" to="*/client_side/templates_tmp.js" />
         </apply>
 
         <!-- Use closule compiler instead of handlebars minifyer (-m flag)
-             because of handlebars not insert line breaks.
+             because of handlebars does not insert line breaks.
              Very long lines are cutted by ant and this brings problems -->
         <apply executable="java">
             <arg value="-jar" />
@@ -57,7 +57,7 @@
             <arg value="--js_output_file" />
             <targetfile />
             <fileset dir=".">
-                <include name="${dialogs_styles_path}/*/js/compiled/templates_tmp.js" />
+                <include name="${dialogs_styles_path}/*/templates_compiled/client_side/templates_tmp.js" />
             </fileset>
             <mapper type="glob" from="*_tmp.js" to="*_tmp.c.js" />
         </apply>
@@ -66,7 +66,7 @@
              some info to files -->
         <move todir="${dialogs_styles_path}" overwrite="true">
             <fileset dir="${dialogs_styles_path}"/>
-            <mapper type="glob" from="*/js/compiled/templates_tmp.c.js" to="*/js/compiled/templates.js"/>
+            <mapper type="glob" from="*/templates_compiled/client_side/templates_tmp.c.js" to="*/templates_compiled/client_side/templates.js"/>
 
             <filterchain>
                 <!-- Add header -->
@@ -80,19 +80,19 @@
 
         <!-- Remove all temporary files -->
         <!-- Use system 'rm' instead of ant
-             'delete' task because it do not work with dirsets -->
+             'delete' task because it does not work with dirsets -->
         <echo>Remove temporary files</echo>
         <apply executable="rm">
             <arg value="-r" />
             <arg value="-f" />
             <dirset dir=".">
-                <include name="${dialogs_styles_path}/*/handlebars_templates_tmp" />
+                <include name="${dialogs_styles_path}/*/templates_compiled/client_side_tmp" />
             </dirset>
         </apply>
 
         <delete>
             <fileset dir=".">
-                <include name="${dialogs_styles_path}/*/js/compiled/templates_tmp.js" />
+                <include name="${dialogs_styles_path}/*/templates_compiled/client_side/templates_tmp.js" />
             </fileset>
         </delete>
 
diff --git a/src/mibew/styles/dialogs/default/js/compiled/templates.js b/src/mibew/styles/dialogs/default/templates_compiled/client_side/templates.js
similarity index 100%
rename from src/mibew/styles/dialogs/default/js/compiled/templates.js
rename to src/mibew/styles/dialogs/default/templates_compiled/client_side/templates.js
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/avatar.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/avatar.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/avatar.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/avatar.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/close.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/close.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/close.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/close.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/history.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/history.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/history.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/history.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/redirect.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/redirect.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/redirect.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/redirect.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/refresh.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/refresh.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/refresh.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/refresh.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/secure_mode.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/secure_mode.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/secure_mode.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/secure_mode.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/send_mail.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/send_mail.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/send_mail.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/send_mail.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/sound.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/sound.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/sound.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/sound.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/user_name.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/user_name.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/controls/user_name.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/controls/user_name.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/layout.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/layout.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/layout.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/layout.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/message.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/message.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/message.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/message.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/message_form.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/message_form.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/message_form.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/message_form.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/status/base.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/status/base.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/status/base.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/status/base.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/status/message.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/status/message.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/status/message.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/status/message.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/chat/status/typing.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/chat/status/typing.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/chat/status/typing.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/chat/status/typing.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/invitation/layout.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/invitation/layout.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/invitation/layout.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/invitation/layout.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/leave_message/description.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/leave_message/description.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/leave_message/description.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/leave_message/description.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/leave_message/form.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/leave_message/form.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/leave_message/form.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/leave_message/form.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/leave_message/layout.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/leave_message/layout.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/leave_message/layout.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/leave_message/layout.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/leave_message/sent_description.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/leave_message/sent_description.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/leave_message/sent_description.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/leave_message/sent_description.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/survey/form.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/survey/form.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/survey/form.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/survey/form.handlebars
diff --git a/src/mibew/styles/dialogs/default/handlebars_templates/survey/layout.handlebars b/src/mibew/styles/dialogs/default/templates_src/client_side/survey/layout.handlebars
similarity index 100%
rename from src/mibew/styles/dialogs/default/handlebars_templates/survey/layout.handlebars
rename to src/mibew/styles/dialogs/default/templates_src/client_side/survey/layout.handlebars
diff --git a/src/mibew/styles/dialogs/default/templates_src/server_side/chat.handlebars b/src/mibew/styles/dialogs/default/templates_src/server_side/chat.handlebars
index c24b263d..e749b203 100644
--- a/src/mibew/styles/dialogs/default/templates_src/server_side/chat.handlebars
+++ b/src/mibew/styles/dialogs/default/templates_src/server_side/chat.handlebars
@@ -15,7 +15,7 @@
         <script type="text/javascript" src="{{mibewRoot}}/js/libs/handlebars.js"></script>
 
         <!-- Javascript templates -->
-        <script type="text/javascript" src="{{stylePath}}/js/compiled/templates.js"></script>
+        <script type="text/javascript" src="{{stylePath}}/templates_compiled/client_side/templates.js"></script>
 
         <!-- Application files -->
         <script type="text/javascript" src="{{mibewRoot}}/js/compiled/mibewapi.js"></script>