diff --git a/public/images/office/Excel-color_16x16x32.png b/app/assets/images/office/Excel-color_16x16x32.png
similarity index 100%
rename from public/images/office/Excel-color_16x16x32.png
rename to app/assets/images/office/Excel-color_16x16x32.png
diff --git a/public/images/office/Excel-xlsx_20x20x32.png b/app/assets/images/office/Excel-xlsx_20x20x32.png
similarity index 100%
rename from public/images/office/Excel-xlsx_20x20x32.png
rename to app/assets/images/office/Excel-xlsx_20x20x32.png
diff --git a/public/images/office/PowerPoint-Color_16x16x32.png b/app/assets/images/office/PowerPoint-Color_16x16x32.png
similarity index 100%
rename from public/images/office/PowerPoint-Color_16x16x32.png
rename to app/assets/images/office/PowerPoint-Color_16x16x32.png
diff --git a/public/images/office/PowerPoint-pptx_20x20x32.png b/app/assets/images/office/PowerPoint-pptx_20x20x32.png
similarity index 100%
rename from public/images/office/PowerPoint-pptx_20x20x32.png
rename to app/assets/images/office/PowerPoint-pptx_20x20x32.png
diff --git a/public/images/office/Word-color_16x16x32.png b/app/assets/images/office/Word-color_16x16x32.png
similarity index 100%
rename from public/images/office/Word-color_16x16x32.png
rename to app/assets/images/office/Word-color_16x16x32.png
diff --git a/public/images/office/Word-docx_20x20x32.png b/app/assets/images/office/Word-docx_20x20x32.png
similarity index 100%
rename from public/images/office/Word-docx_20x20x32.png
rename to app/assets/images/office/Word-docx_20x20x32.png
diff --git a/app/models/my_module.rb b/app/models/my_module.rb
index 274702c66..23527d5c4 100644
--- a/app/models/my_module.rb
+++ b/app/models/my_module.rb
@@ -285,7 +285,7 @@ class MyModule < ApplicationRecord
       if !final.include?(my_module)
         final << my_module
       end
-      modules.push(*my_module.my_modules.flatten)
+      modules.push(*my_module.my_modules)
     end
     final
   end
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 7fdc8322f..5bbb96a3c 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -36,10 +36,10 @@ if ENV['PAPERCLIP_STORAGE'] == "s3"
       medium: :private
     },
     s3_storage_class: {
-      medium: :reduced_redundancy,
-      thumb: :reduced_redundancy,
-      icon: :reduced_redundancy,
-      icon_small: :reduced_redundancy
+      medium: :REDUCED_REDUNDANCY,
+      thumb: :REDUCED_REDUNDANCY,
+      icon: :REDUCED_REDUNDANCY,
+      icon_small: :REDUCED_REDUNDANCY
     }
   })
 elsif ENV['PAPERCLIP_STORAGE'] == "filesystem"