diff --git a/plugins/video/lib/video_plugin/video.rb b/plugins/video/lib/video_plugin/video.rb
index 446a8d0..ba51d36 100644
--- a/plugins/video/lib/video_plugin/video.rb
+++ b/plugins/video/lib/video_plugin/video.rb
@@ -40,7 +40,7 @@ class VideoPlugin::Video < Article
   def to_html(options={})
     article = self
     proc do
-      render :partial => 'content_viewer/video', :locals => {:article => article}
+      render :partial => 'content_viewer/video_plugin/video', :locals => {:article => article}
     end
   end
 
diff --git a/plugins/video/lib/video_plugin/video_gallery.rb b/plugins/video/lib/video_plugin/video_gallery.rb
index 49a20c9..2159550 100644
--- a/plugins/video/lib/video_plugin/video_gallery.rb
+++ b/plugins/video/lib/video_plugin/video_gallery.rb
@@ -36,7 +36,7 @@ class VideoPlugin::VideoGallery < Folder
   def to_html(options = {})
     video_gallery = self
     proc do
-      render :partial => 'content_viewer/video_gallery', :locals => {:video_gallery => video_gallery}
+      render :partial => 'content_viewer/video_plugin/video_gallery', :locals => {:video_gallery => video_gallery}
     end
   end
 
diff --git a/plugins/video/views/cms/_video.html.erb b/plugins/video/views/cms/_video.html.erb
deleted file mode 100644
index 0baa15d..0000000
--- a/plugins/video/views/cms/_video.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= required_fields_message %>
-
-<div>
-<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
-<%= required labelled_form_field _('URL of the video'), text_field(:article, :video_url, :size => 300) %>
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
-<%= render :partial => 'general_fields' %>
-<%= render :partial => 'translatable' %>
-</div>
-
-
-
diff --git a/plugins/video/views/cms/_video_gallery.html.erb b/plugins/video/views/cms/_video_gallery.html.erb
deleted file mode 100644
index ce95bd1..0000000
--- a/plugins/video/views/cms/_video_gallery.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= required_fields_message %>
-
-<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
-<%= render :partial => 'general_fields' %>
-
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
diff --git a/plugins/video/views/cms/video_plugin/_video.html.erb b/plugins/video/views/cms/video_plugin/_video.html.erb
new file mode 100644
index 0000000..0baa15d
--- /dev/null
+++ b/plugins/video/views/cms/video_plugin/_video.html.erb
@@ -0,0 +1,12 @@
+<%= required_fields_message %>
+
+<div>
+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+<%= required labelled_form_field _('URL of the video'), text_field(:article, :video_url, :size => 300) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
+<%= render :partial => 'general_fields' %>
+<%= render :partial => 'translatable' %>
+</div>
+
+
+
diff --git a/plugins/video/views/cms/video_plugin/_video_gallery.html.erb b/plugins/video/views/cms/video_plugin/_video_gallery.html.erb
new file mode 100644
index 0000000..ce95bd1
--- /dev/null
+++ b/plugins/video/views/cms/video_plugin/_video_gallery.html.erb
@@ -0,0 +1,6 @@
+<%= required_fields_message %>
+
+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+<%= render :partial => 'general_fields' %>
+
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
diff --git a/plugins/video/views/content_viewer/_video.html.erb b/plugins/video/views/content_viewer/_video.html.erb
deleted file mode 100644
index a2bf68b..0000000
--- a/plugins/video/views/content_viewer/_video.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<div align="center">
-<%if @page.video_provider=='youtube' %>
-  <link type="text/css" rel="stylesheet" href="/plugins/video/css/video-js-4.5.1.css" />
-  <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
-    width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>"
-    data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"youtube\"], \"src\": \"#{@page.video_url}\" }") %>'>
-    <%= @page.no_browser_support_message %>
-  </video>
-  <script src="/plugins/video/javascripts/videojs/video-4.5.1.js"></script>
-  <script src="/plugins/video/javascripts/videojs/vjs.youtube.js"></script>
- <% elsif  @page.video_provider=='vimeo' %>
-  <link type="text/css" rel="stylesheet" href="/plugins/video/css/video-js-4.5.1.css" />
-  <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
-    width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>"
-    data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"vimeo\"], \"src\": \"#{@page.video_url}\", \"loop\": true, \"autoplay\": false  }") %>'>
-    <%= @page.no_browser_support_message %>
-  </video>
-  <script src="/plugins/video/javascripts/videojs/video-4.5.1.js"></script>
-  <script src="/plugins/video/javascripts/videojs/vjs.vimeo.js"></script>
-<% elsif  @page.video_provider=='file' %>
-  <link href="/plugins/video/css/video-js-4.8.5.css" rel="stylesheet">
-  <script src="/plugins/video/javascripts/videojs/video-4.8.5.js"></script>
-  <video id="embedded_video" class="video-js vjs-default-skin vjs-big-play-centered"
-    height="353" width="499"
-    controls preload="auto"
-    data-setup='<%=CGI::escapeHTML("{ \"example_option\":true}") %>'>
-   <source src="<%= @page.video_url %>" type='<%= @page.video_format %>' />
-   <%= @page.no_browser_support_message %>
-  </video>
-<% end %>
-<br style="clear:both" />
-</div>
-<% _("Description:") %>
-<%= @page.body %>
diff --git a/plugins/video/views/content_viewer/_video_gallery.html.erb b/plugins/video/views/content_viewer/_video_gallery.html.erb
deleted file mode 100644
index 26da37e..0000000
--- a/plugins/video/views/content_viewer/_video_gallery.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% extend VideoPlugin::VideoGalleryHelper %>
-
-<% unless video_gallery.body.blank? %>
-  <div>
-    <%= video_gallery.body %>
-  </div>
-  <hr/>
-<% end %>
-
-<% if video_gallery.children.empty? %>
-  <em><%= _('(empty video gallery)') %></em>
-<% else %>
-  <%= list_videos(:contents=>video_gallery.children) %>
-<% end %>
\ No newline at end of file
diff --git a/plugins/video/views/content_viewer/video_plugin/_video.html.erb b/plugins/video/views/content_viewer/video_plugin/_video.html.erb
new file mode 100644
index 0000000..a2bf68b
--- /dev/null
+++ b/plugins/video/views/content_viewer/video_plugin/_video.html.erb
@@ -0,0 +1,34 @@
+<div align="center">
+<%if @page.video_provider=='youtube' %>
+  <link type="text/css" rel="stylesheet" href="/plugins/video/css/video-js-4.5.1.css" />
+  <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
+    width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>"
+    data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"youtube\"], \"src\": \"#{@page.video_url}\" }") %>'>
+    <%= @page.no_browser_support_message %>
+  </video>
+  <script src="/plugins/video/javascripts/videojs/video-4.5.1.js"></script>
+  <script src="/plugins/video/javascripts/videojs/vjs.youtube.js"></script>
+ <% elsif  @page.video_provider=='vimeo' %>
+  <link type="text/css" rel="stylesheet" href="/plugins/video/css/video-js-4.5.1.css" />
+  <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
+    width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>"
+    data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"vimeo\"], \"src\": \"#{@page.video_url}\", \"loop\": true, \"autoplay\": false  }") %>'>
+    <%= @page.no_browser_support_message %>
+  </video>
+  <script src="/plugins/video/javascripts/videojs/video-4.5.1.js"></script>
+  <script src="/plugins/video/javascripts/videojs/vjs.vimeo.js"></script>
+<% elsif  @page.video_provider=='file' %>
+  <link href="/plugins/video/css/video-js-4.8.5.css" rel="stylesheet">
+  <script src="/plugins/video/javascripts/videojs/video-4.8.5.js"></script>
+  <video id="embedded_video" class="video-js vjs-default-skin vjs-big-play-centered"
+    height="353" width="499"
+    controls preload="auto"
+    data-setup='<%=CGI::escapeHTML("{ \"example_option\":true}") %>'>
+   <source src="<%= @page.video_url %>" type='<%= @page.video_format %>' />
+   <%= @page.no_browser_support_message %>
+  </video>
+<% end %>
+<br style="clear:both" />
+</div>
+<% _("Description:") %>
+<%= @page.body %>
diff --git a/plugins/video/views/content_viewer/video_plugin/_video_gallery.html.erb b/plugins/video/views/content_viewer/video_plugin/_video_gallery.html.erb
new file mode 100644
index 0000000..26da37e
--- /dev/null
+++ b/plugins/video/views/content_viewer/video_plugin/_video_gallery.html.erb
@@ -0,0 +1,14 @@
+<% extend VideoPlugin::VideoGalleryHelper %>
+
+<% unless video_gallery.body.blank? %>
+  <div>
+    <%= video_gallery.body %>
+  </div>
+  <hr/>
+<% end %>
+
+<% if video_gallery.children.empty? %>
+  <em><%= _('(empty video gallery)') %></em>
+<% else %>
+  <%= list_videos(:contents=>video_gallery.children) %>
+<% end %>
\ No newline at end of file
--
libgit2 0.21.2