diff --git a/plugins/community_hub/views/community_hub_plugin_public/_banner.html.erb b/plugins/community_hub/views/community_hub_plugin_public/_banner.html.erb
new file mode 100644
index 0000000..4453ecc
--- /dev/null
+++ b/plugins/community_hub/views/community_hub_plugin_public/_banner.html.erb
@@ -0,0 +1,3 @@
+<div class="banner">
+  <span><%= _("BANNER SPACE") %></span>
+</div>
\ No newline at end of file
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_banner.rhtml b/plugins/community_hub/views/community_hub_plugin_public/_banner.rhtml
deleted file mode 100644
index 4453ecc..0000000
--- a/plugins/community_hub/views/community_hub_plugin_public/_banner.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="banner">
-  <span><%= _("BANNER SPACE") %></span>
-</div>
\ No newline at end of file
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_embed.html.erb b/plugins/community_hub/views/community_hub_plugin_public/_embed.html.erb
new file mode 100644
index 0000000..dc69d6a
--- /dev/null
+++ b/plugins/community_hub/views/community_hub_plugin_public/_embed.html.erb
@@ -0,0 +1,11 @@
+<% extend CommunityHubPlugin::HubHelper %>
+
+<div class="embed">
+  <span class="label">Embed / <%= _("Embed") %></span>
+  <textarea cols="38" 
+          id="comment_body" 
+          name="comment[body]" 
+          rows="10"
+          class="code" 
+          style="width: 99%;"><%= embed_code(@page) %></textarea>
+</div>
\ No newline at end of file
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_embed.rhtml b/plugins/community_hub/views/community_hub_plugin_public/_embed.rhtml
deleted file mode 100644
index dc69d6a..0000000
--- a/plugins/community_hub/views/community_hub_plugin_public/_embed.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<% extend CommunityHubPlugin::HubHelper %>
-
-<div class="embed">
-  <span class="label">Embed / <%= _("Embed") %></span>
-  <textarea cols="38" 
-          id="comment_body" 
-          name="comment[body]" 
-          rows="10"
-          class="code" 
-          style="width: 99%;"><%= embed_code(@page) %></textarea>
-</div>
\ No newline at end of file
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_mediation.html.erb b/plugins/community_hub/views/community_hub_plugin_public/_mediation.html.erb
new file mode 100644
index 0000000..fdccdd3
--- /dev/null
+++ b/plugins/community_hub/views/community_hub_plugin_public/_mediation.html.erb
@@ -0,0 +1,87 @@
+<% extend CommunityHubPlugin::HubHelper %>
+
+<li id="<%= mediation.id %>" class="post">
+
+  <ul>
+    <li class="time"><%= post_time(mediation.created_at) %></li>
+
+    <li class="avatar">
+      <% if mediation.source == 'twitter' %>
+        <%= image_tag(mediation.profile_picture, :alt => "Twitter") %>
+      <% elsif mediation.source == 'facebook' %>
+        <%= image_tag('/plugins/community_hub/icons/logo_facebook_50x50.png', :alt => "Facebook") %>
+      <% else %>
+        <%= image_tag(profile_icon(mediation.author, :minor)) if mediation.author %>
+      <% end %>
+    </li>
+    <li class="message"><span class="author"><%= mediation.setting[:author_name] %>:</span> <%= mediation.body %></li>
+
+    <% if mediator?(hub) %>
+    <li class="mediation-bar">
+
+      <ul>
+
+        <% if mediation.source != 'twitter' && mediation.source != 'facebook' %>
+
+        <li class="promote">
+          <% if !promoted?(hub, mediation.author.id) %>
+          <a id="<%= mediation.id %>" href="#" onclick="promote_user(<%= mediation.id %>,<%= mediation.author.id %>); return false;">
+            <img class="not-promoted" src="/plugins/community_hub/icons/hub-not-promote-icon.png" title="<%= _("User not promoted") %>" />
+          </a>
+          <% else %>
+            <img class="promoted" src="/plugins/community_hub/icons/hub-not-promote-icon.png" title="<%= _("User promoted") %>" />
+          <% end %>
+        </li>
+
+        <% end %>
+
+        <% if pinned_mediation?(hub, mediation.id) %>
+        <li class="pin">
+          <img class="pinned" src="/plugins/community_hub/icons/hub-not-pinned-icon.png" title="<%= _("Message pinned")%>" />
+        </li>
+        <% end %>
+
+      </ul>
+
+    </li>
+    <% end %>
+
+  </ul>
+
+    <% total_mediation_comments = mediation.comments.count %>
+
+    <span class="comment-count">
+      <%= link_to( "<span id='mediation-comment-total-#{mediation.id}'>#{total_mediation_comments}</span> " + _("Comments") , '#',
+            :class => 'display-comment-form',
+            :id => 'top-post-comment-button',
+            :onclick => "toogle_mediation_comments(#{mediation.id}); return false;") %>
+    </span>
+
+    <script type="text/javascript">
+      mediations.push( [ <%= mediation.id %>, setInterval(function() { update_mediation_comments('<%= mediation.id %>', false)}, 5000) ] );
+    </script>
+
+    <ul id="mediation-comment-list-<%=mediation.id%>" class="mediation-comment-list" style="display:none;">
+    <% if mediation.accept_comments? && mediation.comments.count > 0 %>
+      <%= render :partial => 'community_hub_plugin_public/mediation_comment', :collection => mediation.comments %>
+    <% end %>
+    </ul>
+
+    <% if logged_in? && mediation.accept_comments? %>
+     <div id='mediation-comment-form-<%=mediation.id%>' class='mediation-comment-form' style="display:none;">
+        <%= render :partial => 'community_hub_plugin_public/mediation_comment_form',
+                   :locals => {
+                      :hub => hub,
+                      :mediation => mediation,
+                      :comment => Comment.new,
+                      :url => {
+                        :controller => :comment,
+                        :action => :create
+                      },
+                      :display_link => true,
+                      :cancel_triggers_hide => true
+                   } %>
+      </div>
+    <% end %>
+
+</li>
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_mediation.rhtml b/plugins/community_hub/views/community_hub_plugin_public/_mediation.rhtml
deleted file mode 100644
index fdccdd3..0000000
--- a/plugins/community_hub/views/community_hub_plugin_public/_mediation.rhtml
+++ /dev/null
@@ -1,87 +0,0 @@
-<% extend CommunityHubPlugin::HubHelper %>
-
-<li id="<%= mediation.id %>" class="post">
-
-  <ul>
-    <li class="time"><%= post_time(mediation.created_at) %></li>
-
-    <li class="avatar">
-      <% if mediation.source == 'twitter' %>
-        <%= image_tag(mediation.profile_picture, :alt => "Twitter") %>
-      <% elsif mediation.source == 'facebook' %>
-        <%= image_tag('/plugins/community_hub/icons/logo_facebook_50x50.png', :alt => "Facebook") %>
-      <% else %>
-        <%= image_tag(profile_icon(mediation.author, :minor)) if mediation.author %>
-      <% end %>
-    </li>
-    <li class="message"><span class="author"><%= mediation.setting[:author_name] %>:</span> <%= mediation.body %></li>
-
-    <% if mediator?(hub) %>
-    <li class="mediation-bar">
-
-      <ul>
-
-        <% if mediation.source != 'twitter' && mediation.source != 'facebook' %>
-
-        <li class="promote">
-          <% if !promoted?(hub, mediation.author.id) %>
-          <a id="<%= mediation.id %>" href="#" onclick="promote_user(<%= mediation.id %>,<%= mediation.author.id %>); return false;">
-            <img class="not-promoted" src="/plugins/community_hub/icons/hub-not-promote-icon.png" title="<%= _("User not promoted") %>" />
-          </a>
-          <% else %>
-            <img class="promoted" src="/plugins/community_hub/icons/hub-not-promote-icon.png" title="<%= _("User promoted") %>" />
-          <% end %>
-        </li>
-
-        <% end %>
-
-        <% if pinned_mediation?(hub, mediation.id) %>
-        <li class="pin">
-          <img class="pinned" src="/plugins/community_hub/icons/hub-not-pinned-icon.png" title="<%= _("Message pinned")%>" />
-        </li>
-        <% end %>
-
-      </ul>
-
-    </li>
-    <% end %>
-
-  </ul>
-
-    <% total_mediation_comments = mediation.comments.count %>
-
-    <span class="comment-count">
-      <%= link_to( "<span id='mediation-comment-total-#{mediation.id}'>#{total_mediation_comments}</span> " + _("Comments") , '#',
-            :class => 'display-comment-form',
-            :id => 'top-post-comment-button',
-            :onclick => "toogle_mediation_comments(#{mediation.id}); return false;") %>
-    </span>
-
-    <script type="text/javascript">
-      mediations.push( [ <%= mediation.id %>, setInterval(function() { update_mediation_comments('<%= mediation.id %>', false)}, 5000) ] );
-    </script>
-
-    <ul id="mediation-comment-list-<%=mediation.id%>" class="mediation-comment-list" style="display:none;">
-    <% if mediation.accept_comments? && mediation.comments.count > 0 %>
-      <%= render :partial => 'community_hub_plugin_public/mediation_comment', :collection => mediation.comments %>
-    <% end %>
-    </ul>
-
-    <% if logged_in? && mediation.accept_comments? %>
-     <div id='mediation-comment-form-<%=mediation.id%>' class='mediation-comment-form' style="display:none;">
-        <%= render :partial => 'community_hub_plugin_public/mediation_comment_form',
-                   :locals => {
-                      :hub => hub,
-                      :mediation => mediation,
-                      :comment => Comment.new,
-                      :url => {
-                        :controller => :comment,
-                        :action => :create
-                      },
-                      :display_link => true,
-                      :cancel_triggers_hide => true
-                   } %>
-      </div>
-    <% end %>
-
-</li>
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment.html.erb b/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment.html.erb
new file mode 100644
index 0000000..5219927
--- /dev/null
+++ b/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment.html.erb
@@ -0,0 +1,6 @@
+<li id="<%= mediation_comment.id %>" class="mediation-comment">
+  <ul>
+    <li class="avatar"><%= image_tag(profile_icon(mediation_comment.author, :minor)) %></li>
+    <li class="message"><span class="author"><%= mediation_comment.author_name %>:</span> <%= mediation_comment.body %></li>
+  </ul>
+</li>
\ No newline at end of file
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment.rhtml b/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment.rhtml
deleted file mode 100644
index 5219927..0000000
--- a/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<li id="<%= mediation_comment.id %>" class="mediation-comment">
-  <ul>
-    <li class="avatar"><%= image_tag(profile_icon(mediation_comment.author, :minor)) %></li>
-    <li class="message"><span class="author"><%= mediation_comment.author_name %>:</span> <%= mediation_comment.body %></li>
-  </ul>
-</li>
\ No newline at end of file
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment_form.html.erb b/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment_form.html.erb
new file mode 100644
index 0000000..3579fac
--- /dev/null
+++ b/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment_form.html.erb
@@ -0,0 +1,12 @@
+<% form_for :message,
+            :method => 'post',
+            :url => {
+              :controller => 'community_hub_plugin_public',
+              :action => 'new_message',
+              :article_id => mediation.id
+            } do |f| %>
+  <%= f.text_area(:body,
+                  :rows => 4,
+                  :placeholder => _('Type your comment here')) %>
+  <%= submit_button('add', _('Post'), :onclick => "new_mediation_comment(this,#{mediation.id}); return false;") %>
+<% end %>
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment_form.rhtml b/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment_form.rhtml
deleted file mode 100644
index 3579fac..0000000
--- a/plugins/community_hub/views/community_hub_plugin_public/_mediation_comment_form.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<% form_for :message,
-            :method => 'post',
-            :url => {
-              :controller => 'community_hub_plugin_public',
-              :action => 'new_message',
-              :article_id => mediation.id
-            } do |f| %>
-  <%= f.text_area(:body,
-                  :rows => 4,
-                  :placeholder => _('Type your comment here')) %>
-  <%= submit_button('add', _('Post'), :onclick => "new_mediation_comment(this,#{mediation.id}); return false;") %>
-<% end %>
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_post.html.erb b/plugins/community_hub/views/community_hub_plugin_public/_post.html.erb
new file mode 100644
index 0000000..6f26978
--- /dev/null
+++ b/plugins/community_hub/views/community_hub_plugin_public/_post.html.erb
@@ -0,0 +1,34 @@
+<% extend CommunityHubPlugin::HubHelper %>
+
+<li id="<%= post.id %>" class="post">
+  <ul>
+    <li class="time"><%= post_time(post.created_at) %></li>
+    <li class="avatar">
+      <% if post.title == 'hub-message-twitter' %>
+        <%= image_tag(post.profile_picture, :alt => "Twitter") %>
+      <% elsif post.title == 'hub-message-facebook' %>
+        <%= image_tag('/plugins/community_hub/icons/logo_facebook_50x50.png', :alt => "Facebook") %>
+      <% else %>
+        <%= image_tag(profile_icon(post.author, :minor)) if post.author %>
+      <% end %>
+    </li>
+    <li class="message"><span class="author"><%= post.author_name %>:</span> <%= post.body %></li>
+
+    <% if mediator?(hub) && post.title != 'hub-message-facebook' %>
+    <li class="mediation-bar">
+      <ul>
+        <li class="pin">
+          <% if !pinned_message?(hub, post.id)  %>
+          <a id="<%= post.id %>" href="#" onclick="pin_message(<%= post.id %>); return false;">
+        	  <img class="not-pinned" src="/plugins/community_hub/icons/hub-pinned-icon.png" title="<%= _("Pin message")%>" />
+          </a>
+          <% else %>
+            <img class="pinned" src="/plugins/community_hub/icons/hub-not-pinned-icon.png" title="<%= _("Message pinned")%>" />
+          <% end %>
+        </li>
+      </ul>
+    </li>
+    <% end %>
+
+  </ul>
+</li>
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_post.rhtml b/plugins/community_hub/views/community_hub_plugin_public/_post.rhtml
deleted file mode 100644
index 6f26978..0000000
--- a/plugins/community_hub/views/community_hub_plugin_public/_post.rhtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<% extend CommunityHubPlugin::HubHelper %>
-
-<li id="<%= post.id %>" class="post">
-  <ul>
-    <li class="time"><%= post_time(post.created_at) %></li>
-    <li class="avatar">
-      <% if post.title == 'hub-message-twitter' %>
-        <%= image_tag(post.profile_picture, :alt => "Twitter") %>
-      <% elsif post.title == 'hub-message-facebook' %>
-        <%= image_tag('/plugins/community_hub/icons/logo_facebook_50x50.png', :alt => "Facebook") %>
-      <% else %>
-        <%= image_tag(profile_icon(post.author, :minor)) if post.author %>
-      <% end %>
-    </li>
-    <li class="message"><span class="author"><%= post.author_name %>:</span> <%= post.body %></li>
-
-    <% if mediator?(hub) && post.title != 'hub-message-facebook' %>
-    <li class="mediation-bar">
-      <ul>
-        <li class="pin">
-          <% if !pinned_message?(hub, post.id)  %>
-          <a id="<%= post.id %>" href="#" onclick="pin_message(<%= post.id %>); return false;">
-        	  <img class="not-pinned" src="/plugins/community_hub/icons/hub-pinned-icon.png" title="<%= _("Pin message")%>" />
-          </a>
-          <% else %>
-            <img class="pinned" src="/plugins/community_hub/icons/hub-not-pinned-icon.png" title="<%= _("Message pinned")%>" />
-          <% end %>
-        </li>
-      </ul>
-    </li>
-    <% end %>
-
-  </ul>
-</li>
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_settings.html.erb b/plugins/community_hub/views/community_hub_plugin_public/_settings.html.erb
new file mode 100644
index 0000000..68e6f50
--- /dev/null
+++ b/plugins/community_hub/views/community_hub_plugin_public/_settings.html.erb
@@ -0,0 +1,7 @@
+<div class="settings">
+	<ul class="settings">
+		<li class="general">
+			<%= link_to _("General settings"), :controller => 'cms', :action => 'edit', :id => @page.id %>
+		</li>
+	</ul>
+</div>
diff --git a/plugins/community_hub/views/community_hub_plugin_public/_settings.rhtml b/plugins/community_hub/views/community_hub_plugin_public/_settings.rhtml
deleted file mode 100644
index 68e6f50..0000000
--- a/plugins/community_hub/views/community_hub_plugin_public/_settings.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="settings">
-	<ul class="settings">
-		<li class="general">
-			<%= link_to _("General settings"), :controller => 'cms', :action => 'edit', :id => @page.id %>
-		</li>
-	</ul>
-</div>
--
libgit2 0.21.2