diff --git a/modules/base/luasrc/luasrc/cacheloader.lua b/modules/base/luasrc/cacheloader.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/cacheloader.lua
rename to modules/base/luasrc/cacheloader.lua
diff --git a/modules/base/luasrc/luasrc/cbi.lua b/modules/base/luasrc/cbi.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/cbi.lua
rename to modules/base/luasrc/cbi.lua
diff --git a/modules/base/luasrc/luasrc/cbi/datatypes.lua b/modules/base/luasrc/cbi/datatypes.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/cbi/datatypes.lua
rename to modules/base/luasrc/cbi/datatypes.lua
diff --git a/modules/base/luasrc/luasrc/config.lua b/modules/base/luasrc/config.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/config.lua
rename to modules/base/luasrc/config.lua
diff --git a/modules/base/luasrc/luasrc/dispatcher.lua b/modules/base/luasrc/dispatcher.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/dispatcher.lua
rename to modules/base/luasrc/dispatcher.lua
diff --git a/modules/base/luasrc/luasrc/http.lua b/modules/base/luasrc/http.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/http.lua
rename to modules/base/luasrc/http.lua
diff --git a/modules/base/luasrc/luasrc/http/protocol.lua b/modules/base/luasrc/http/protocol.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/http/protocol.lua
rename to modules/base/luasrc/http/protocol.lua
diff --git a/modules/base/luasrc/luasrc/http/protocol/conditionals.lua b/modules/base/luasrc/http/protocol/conditionals.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/http/protocol/conditionals.lua
rename to modules/base/luasrc/http/protocol/conditionals.lua
diff --git a/modules/base/luasrc/luasrc/http/protocol/date.lua b/modules/base/luasrc/http/protocol/date.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/http/protocol/date.lua
rename to modules/base/luasrc/http/protocol/date.lua
diff --git a/modules/base/luasrc/luasrc/http/protocol/mime.lua b/modules/base/luasrc/http/protocol/mime.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/http/protocol/mime.lua
rename to modules/base/luasrc/http/protocol/mime.lua
diff --git a/modules/base/luasrc/luasrc/i18n.lua b/modules/base/luasrc/i18n.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/i18n.lua
rename to modules/base/luasrc/i18n.lua
diff --git a/modules/base/luasrc/luasrc/sauth.lua b/modules/base/luasrc/sauth.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/sauth.lua
rename to modules/base/luasrc/sauth.lua
diff --git a/modules/base/luasrc/luasrc/template.lua b/modules/base/luasrc/template.lua
similarity index 100%
rename from modules/base/luasrc/luasrc/template.lua
rename to modules/base/luasrc/template.lua
diff --git a/modules/base/luasrc/luasrc/view/cbi/apply_xhr.htm b/modules/base/luasrc/view/cbi/apply_xhr.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/apply_xhr.htm
rename to modules/base/luasrc/view/cbi/apply_xhr.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/browser.htm b/modules/base/luasrc/view/cbi/browser.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/browser.htm
rename to modules/base/luasrc/view/cbi/browser.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/button.htm b/modules/base/luasrc/view/cbi/button.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/button.htm
rename to modules/base/luasrc/view/cbi/button.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/cell_valuefooter.htm b/modules/base/luasrc/view/cbi/cell_valuefooter.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/cell_valuefooter.htm
rename to modules/base/luasrc/view/cbi/cell_valuefooter.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/cell_valueheader.htm b/modules/base/luasrc/view/cbi/cell_valueheader.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/cell_valueheader.htm
rename to modules/base/luasrc/view/cbi/cell_valueheader.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/compound.htm b/modules/base/luasrc/view/cbi/compound.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/compound.htm
rename to modules/base/luasrc/view/cbi/compound.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/delegator.htm b/modules/base/luasrc/view/cbi/delegator.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/delegator.htm
rename to modules/base/luasrc/view/cbi/delegator.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/dvalue.htm b/modules/base/luasrc/view/cbi/dvalue.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/dvalue.htm
rename to modules/base/luasrc/view/cbi/dvalue.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/dynlist.htm b/modules/base/luasrc/view/cbi/dynlist.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/dynlist.htm
rename to modules/base/luasrc/view/cbi/dynlist.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/filebrowser.htm b/modules/base/luasrc/view/cbi/filebrowser.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/filebrowser.htm
rename to modules/base/luasrc/view/cbi/filebrowser.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/firewall_zoneforwards.htm b/modules/base/luasrc/view/cbi/firewall_zoneforwards.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/firewall_zoneforwards.htm
rename to modules/base/luasrc/view/cbi/firewall_zoneforwards.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/firewall_zonelist.htm b/modules/base/luasrc/view/cbi/firewall_zonelist.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/firewall_zonelist.htm
rename to modules/base/luasrc/view/cbi/firewall_zonelist.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/footer.htm b/modules/base/luasrc/view/cbi/footer.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/footer.htm
rename to modules/base/luasrc/view/cbi/footer.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/full_valuefooter.htm b/modules/base/luasrc/view/cbi/full_valuefooter.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/full_valuefooter.htm
rename to modules/base/luasrc/view/cbi/full_valuefooter.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/full_valueheader.htm b/modules/base/luasrc/view/cbi/full_valueheader.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/full_valueheader.htm
rename to modules/base/luasrc/view/cbi/full_valueheader.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/fvalue.htm b/modules/base/luasrc/view/cbi/fvalue.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/fvalue.htm
rename to modules/base/luasrc/view/cbi/fvalue.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/header.htm b/modules/base/luasrc/view/cbi/header.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/header.htm
rename to modules/base/luasrc/view/cbi/header.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/lvalue.htm b/modules/base/luasrc/view/cbi/lvalue.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/lvalue.htm
rename to modules/base/luasrc/view/cbi/lvalue.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/map.htm b/modules/base/luasrc/view/cbi/map.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/map.htm
rename to modules/base/luasrc/view/cbi/map.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/mvalue.htm b/modules/base/luasrc/view/cbi/mvalue.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/mvalue.htm
rename to modules/base/luasrc/view/cbi/mvalue.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/network_ifacelist.htm b/modules/base/luasrc/view/cbi/network_ifacelist.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/network_ifacelist.htm
rename to modules/base/luasrc/view/cbi/network_ifacelist.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/network_netinfo.htm b/modules/base/luasrc/view/cbi/network_netinfo.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/network_netinfo.htm
rename to modules/base/luasrc/view/cbi/network_netinfo.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/network_netlist.htm b/modules/base/luasrc/view/cbi/network_netlist.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/network_netlist.htm
rename to modules/base/luasrc/view/cbi/network_netlist.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/nsection.htm b/modules/base/luasrc/view/cbi/nsection.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/nsection.htm
rename to modules/base/luasrc/view/cbi/nsection.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/nullsection.htm b/modules/base/luasrc/view/cbi/nullsection.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/nullsection.htm
rename to modules/base/luasrc/view/cbi/nullsection.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/simpleform.htm b/modules/base/luasrc/view/cbi/simpleform.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/simpleform.htm
rename to modules/base/luasrc/view/cbi/simpleform.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/tabcontainer.htm b/modules/base/luasrc/view/cbi/tabcontainer.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/tabcontainer.htm
rename to modules/base/luasrc/view/cbi/tabcontainer.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/tabmenu.htm b/modules/base/luasrc/view/cbi/tabmenu.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/tabmenu.htm
rename to modules/base/luasrc/view/cbi/tabmenu.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/tblsection.htm b/modules/base/luasrc/view/cbi/tblsection.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/tblsection.htm
rename to modules/base/luasrc/view/cbi/tblsection.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/tsection.htm b/modules/base/luasrc/view/cbi/tsection.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/tsection.htm
rename to modules/base/luasrc/view/cbi/tsection.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/tvalue.htm b/modules/base/luasrc/view/cbi/tvalue.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/tvalue.htm
rename to modules/base/luasrc/view/cbi/tvalue.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/ucisection.htm b/modules/base/luasrc/view/cbi/ucisection.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/ucisection.htm
rename to modules/base/luasrc/view/cbi/ucisection.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/upload.htm b/modules/base/luasrc/view/cbi/upload.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/upload.htm
rename to modules/base/luasrc/view/cbi/upload.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/value.htm b/modules/base/luasrc/view/cbi/value.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/value.htm
rename to modules/base/luasrc/view/cbi/value.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/valuefooter.htm b/modules/base/luasrc/view/cbi/valuefooter.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/valuefooter.htm
rename to modules/base/luasrc/view/cbi/valuefooter.htm
diff --git a/modules/base/luasrc/luasrc/view/cbi/valueheader.htm b/modules/base/luasrc/view/cbi/valueheader.htm
similarity index 100%
rename from modules/base/luasrc/luasrc/view/cbi/valueheader.htm
rename to modules/base/luasrc/view/cbi/valueheader.htm