diff --git a/plugins/video/views/box_organizer/_html5_video_block.html.erb b/plugins/video/views/box_organizer/_html5_video_block.html.erb
deleted file mode 100644
index a120a21..0000000
--- a/plugins/video/views/box_organizer/_html5_video_block.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<video controls preload="auto" width='<%="#{width}px"%>' height='<%="#{height}px"%>'>
-    <source src=<%= "#{url}" %>>
-</video>
diff --git a/plugins/video/views/box_organizer/_iframe_video_block.html.erb b/plugins/video/views/box_organizer/_iframe_video_block.html.erb
deleted file mode 100644
index efd2994..0000000
--- a/plugins/video/views/box_organizer/_iframe_video_block.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<iframe width='<%="#{width}px"%>' height='<%="#{height}px"%>' src='<%= "#{url}" %>' frameborder="0" allowfullscreen></iframe>
diff --git a/plugins/video/views/box_organizer/_video_block.html.erb b/plugins/video/views/box_organizer/_video_block.html.erb
deleted file mode 100644
index c19d4b6..0000000
--- a/plugins/video/views/box_organizer/_video_block.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<label for="url" class="formlabel"> Video URL: </label>
-
-<div class="formfield type-text">
-  <%= text_field_tag 'block[url]', @block.url, :class => 'video-url', :maxlength => 255 %>
-</div>
-<div class="formfield type-text">
-  <label for="width" class="formlabel"> Width: </label>
-  <%= text_field_tag 'block[width]', @block.width, :size => 7, :class => 'video-width', :maxlength => 5 %>
-  <label for="height" class="formlabel"> Height: </label>
-  <%= text_field_tag 'block[height]', @block.height, :size => 7, :class => 'video-height', :maxlength => 5 %>
-</div>
diff --git a/plugins/video/views/box_organizer/video_plugin/_html5_video_block.html.erb b/plugins/video/views/box_organizer/video_plugin/_html5_video_block.html.erb
new file mode 100644
index 0000000..a120a21
--- /dev/null
+++ b/plugins/video/views/box_organizer/video_plugin/_html5_video_block.html.erb
@@ -0,0 +1,3 @@
+<video controls preload="auto" width='<%="#{width}px"%>' height='<%="#{height}px"%>'>
+    <source src=<%= "#{url}" %>>
+</video>
diff --git a/plugins/video/views/box_organizer/video_plugin/_iframe_video_block.html.erb b/plugins/video/views/box_organizer/video_plugin/_iframe_video_block.html.erb
new file mode 100644
index 0000000..efd2994
--- /dev/null
+++ b/plugins/video/views/box_organizer/video_plugin/_iframe_video_block.html.erb
@@ -0,0 +1 @@
+<iframe width='<%="#{width}px"%>' height='<%="#{height}px"%>' src='<%= "#{url}" %>' frameborder="0" allowfullscreen></iframe>
diff --git a/plugins/video/views/box_organizer/video_plugin/_video_block.html.erb b/plugins/video/views/box_organizer/video_plugin/_video_block.html.erb
new file mode 100644
index 0000000..c19d4b6
--- /dev/null
+++ b/plugins/video/views/box_organizer/video_plugin/_video_block.html.erb
@@ -0,0 +1,11 @@
+<label for="url" class="formlabel"> Video URL: </label>
+
+<div class="formfield type-text">
+  <%= text_field_tag 'block[url]', @block.url, :class => 'video-url', :maxlength => 255 %>
+</div>
+<div class="formfield type-text">
+  <label for="width" class="formlabel"> Width: </label>
+  <%= text_field_tag 'block[width]', @block.width, :size => 7, :class => 'video-width', :maxlength => 5 %>
+  <label for="height" class="formlabel"> Height: </label>
+  <%= text_field_tag 'block[height]', @block.height, :size => 7, :class => 'video-height', :maxlength => 5 %>
+</div>
diff --git a/plugins/video/views/cms/video.html.erb b/plugins/video/views/cms/video.html.erb
deleted file mode 100644
index 7b3ccbb..0000000
--- a/plugins/video/views/cms/video.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
-#article-header{
-  display: none!important;
-}
-</style>
-
-
-sdsd
\ No newline at end of file
diff --git a/plugins/video/views/cms/video_plugin/_video_video.html.erb b/plugins/video/views/cms/video_plugin/_video_video.html.erb
new file mode 100644
index 0000000..c7fe2f6
--- /dev/null
+++ b/plugins/video/views/cms/video_plugin/_video_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_video_gallery.html.erb b/plugins/video/views/cms/video_plugin/_video_video_gallery.html.erb
new file mode 100644
index 0000000..ce95bd1
--- /dev/null
+++ b/plugins/video/views/cms/video_plugin/_video_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
new file mode 100644
index 0000000..6bbda38
--- /dev/null
+++ b/plugins/video/views/content_viewer/_video.html.erb
@@ -0,0 +1,34 @@
+<div align="center">
+<%if @page.video_provider=='youtube' %>
+  <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.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='{ "techOrder": ["youtube"], "src": "<%= @page.video_url %>" }'>
+    <%= @page.no_browser_support_message %>
+  </video>
+  <script src="https://vjs.zencdn.net/4.5.1/video.js"></script>
+  <script src="/plugins/video/javascripts/videojs/vjs.youtube.js"></script>  
+ <% elsif  @page.video_provider=='vimeo' %>
+  <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.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='{ "techOrder": ["vimeo"], "src": "<%= @page.video_url %>", "loop": true, "autoplay": false }'>
+    <%= @page.no_browser_support_message %>
+  </video>
+  <script src="https://vjs.zencdn.net/4.5.1/video.js"></script>
+  <script src="/plugins/video/javascripts/videojs/vjs.vimeo.js"></script>
+<% elsif  @page.video_provider=='file' %>
+  <link href="https://vjs.zencdn.net/4.8/video-js.css" rel="stylesheet">
+  <script src="https://vjs.zencdn.net/4.8/video.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='{"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 %>
\ No newline at end of file
diff --git a/plugins/video/views/content_viewer/_video_gallery.html.erb b/plugins/video/views/content_viewer/_video_gallery.html.erb
new file mode 100644
index 0000000..5cdf88f
--- /dev/null
+++ b/plugins/video/views/content_viewer/_video_gallery.html.erb
@@ -0,0 +1,28 @@
+<%  
+def self.list_videos(configure={})
+    configure[:recursive] ||= false
+    configure[:list_type] ||= :folder
+    if !configure[:contents].blank?
+      configure[:contents] = configure[:contents].paginate(
+        :order => "updated_at DESC",
+        :per_page => 16,
+        :page => params[:npage]
+      )
+      render :file => 'shared/video_list', :locals => configure
+    else
+      content_tag('em', _('(empty folder)'))
+    end
+  end  
+%>
+<% 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.html.erb b/plugins/video/views/content_viewer/video.html.erb
deleted file mode 100644
index 6bbda38..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="https://vjs.zencdn.net/4.5.1/video-js.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='{ "techOrder": ["youtube"], "src": "<%= @page.video_url %>" }'>
-    <%= @page.no_browser_support_message %>
-  </video>
-  <script src="https://vjs.zencdn.net/4.5.1/video.js"></script>
-  <script src="/plugins/video/javascripts/videojs/vjs.youtube.js"></script>  
- <% elsif  @page.video_provider=='vimeo' %>
-  <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.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='{ "techOrder": ["vimeo"], "src": "<%= @page.video_url %>", "loop": true, "autoplay": false }'>
-    <%= @page.no_browser_support_message %>
-  </video>
-  <script src="https://vjs.zencdn.net/4.5.1/video.js"></script>
-  <script src="/plugins/video/javascripts/videojs/vjs.vimeo.js"></script>
-<% elsif  @page.video_provider=='file' %>
-  <link href="https://vjs.zencdn.net/4.8/video-js.css" rel="stylesheet">
-  <script src="https://vjs.zencdn.net/4.8/video.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='{"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 %>
\ No newline at end of file
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 5cdf88f..0000000
--- a/plugins/video/views/content_viewer/video_gallery.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<%  
-def self.list_videos(configure={})
-    configure[:recursive] ||= false
-    configure[:list_type] ||= :folder
-    if !configure[:contents].blank?
-      configure[:contents] = configure[:contents].paginate(
-        :order => "updated_at DESC",
-        :per_page => 16,
-        :page => params[:npage]
-      )
-      render :file => 'shared/video_list', :locals => configure
-    else
-      content_tag('em', _('(empty folder)'))
-    end
-  end  
-%>
-<% 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_video.html.erb b/plugins/video/views/content_viewer/video_plugin/video_video.html.erb
new file mode 100644
index 0000000..6bbda38
--- /dev/null
+++ b/plugins/video/views/content_viewer/video_plugin/video_video.html.erb
@@ -0,0 +1,34 @@
+<div align="center">
+<%if @page.video_provider=='youtube' %>
+  <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.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='{ "techOrder": ["youtube"], "src": "<%= @page.video_url %>" }'>
+    <%= @page.no_browser_support_message %>
+  </video>
+  <script src="https://vjs.zencdn.net/4.5.1/video.js"></script>
+  <script src="/plugins/video/javascripts/videojs/vjs.youtube.js"></script>  
+ <% elsif  @page.video_provider=='vimeo' %>
+  <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.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='{ "techOrder": ["vimeo"], "src": "<%= @page.video_url %>", "loop": true, "autoplay": false }'>
+    <%= @page.no_browser_support_message %>
+  </video>
+  <script src="https://vjs.zencdn.net/4.5.1/video.js"></script>
+  <script src="/plugins/video/javascripts/videojs/vjs.vimeo.js"></script>
+<% elsif  @page.video_provider=='file' %>
+  <link href="https://vjs.zencdn.net/4.8/video-js.css" rel="stylesheet">
+  <script src="https://vjs.zencdn.net/4.8/video.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='{"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 %>
\ No newline at end of file
diff --git a/plugins/video/views/content_viewer/video_plugin/video_video_gallery.html.erb b/plugins/video/views/content_viewer/video_plugin/video_video_gallery.html.erb
new file mode 100644
index 0000000..5cdf88f
--- /dev/null
+++ b/plugins/video/views/content_viewer/video_plugin/video_video_gallery.html.erb
@@ -0,0 +1,28 @@
+<%  
+def self.list_videos(configure={})
+    configure[:recursive] ||= false
+    configure[:list_type] ||= :folder
+    if !configure[:contents].blank?
+      configure[:contents] = configure[:contents].paginate(
+        :order => "updated_at DESC",
+        :per_page => 16,
+        :page => params[:npage]
+      )
+      render :file => 'shared/video_list', :locals => configure
+    else
+      content_tag('em', _('(empty folder)'))
+    end
+  end  
+%>
+<% 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