diff --git a/event_news_mod.gemspec b/event_news_mod.gemspec
index 7a9e9f5..7ee402d 100644
--- a/event_news_mod.gemspec
+++ b/event_news_mod.gemspec
@@ -13,6 +13,9 @@ if bundle_update_flag
   default_event_news_widget_info = JSON.parse(File.read("#{app_path}/modules/event_news_mod/info.json"))["widgets"].sort_by{|h| h["filename"].to_i} rescue []
   all_template.each do |folder|
     if !folder.include?('mobile')
+      if Dir.exist?("#{folder}modules/event_news_mod/event_news")
+        Bundler.with_clean_env{system ("mv -f #{folder}modules/event_news_mod/event_news/* #{folder}modules/event_news_mod/. && rm -rf #{folder}modules/event_news_mod/event_news")}
+      end
       info_json_file = "#{folder}modules/event_news_mod/info.json"
       if File.exist?(info_json_file)
         Bundler.with_clean_env{system ('cp -f '+ app_path + '/modules/event_news_mod/show.html.erb ' + "#{folder}modules/event_news_mod/.")}
diff --git a/lib/event_news_mod/engine.rb b/lib/event_news_mod/engine.rb
index 46f4605..5e6d810 100644
--- a/lib/event_news_mod/engine.rb
+++ b/lib/event_news_mod/engine.rb
@@ -104,7 +104,7 @@ module EventNewsMod
           template_path = Rails.root.to_s + '/app/templates'
           all_template = Dir.glob(template_path+'/*/')
           all_template.each do |folder|
-            Bundler.with_clean_env{system ("mv #{folder}modules/event_news #{folder}modules/event_news_mod")}
+            Bundler.with_clean_env{system ("mkdir -p #{folder}modules/event_news_mod; mv -f #{folder}modules/event_news/* #{folder}modules/event_news_mod/.")}
           end
         end
         module_label "event_news.event_news"