diff --git a/.gitignore b/.gitignore
index 393d8e8..39f72f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *.log
 *.pid
-docroot/nginx.conf
-docroot/html/writable/*.*
-docroot/html/templates_c/*.*
-docroot/php.ini
-docroot/session.save_path/sess_*
+web/nginx.conf
+web/html/writable/*.*
+web/html/templates_c/*.*
+web/php.ini
+web/session.save_path/sess_*
diff --git a/docroot/Makefile b/web/Makefile
similarity index 100%
rename from docroot/Makefile
rename to web/Makefile
diff --git a/docroot/fastcgi_params b/web/fastcgi_params
similarity index 100%
rename from docroot/fastcgi_params
rename to web/fastcgi_params
diff --git a/docroot/html/_head.php b/web/html/_head.php
similarity index 100%
rename from docroot/html/_head.php
rename to web/html/_head.php
diff --git a/docroot/html/arrays.php b/web/html/arrays.php
similarity index 100%
rename from docroot/html/arrays.php
rename to web/html/arrays.php
diff --git a/docroot/html/basics.php b/web/html/basics.php
similarity index 100%
rename from docroot/html/basics.php
rename to web/html/basics.php
diff --git a/docroot/html/classes.php b/web/html/classes.php
similarity index 100%
rename from docroot/html/classes.php
rename to web/html/classes.php
diff --git a/docroot/html/cookies.php b/web/html/cookies.php
similarity index 100%
rename from docroot/html/cookies.php
rename to web/html/cookies.php
diff --git a/docroot/html/data.txt b/web/html/data.txt
similarity index 100%
rename from docroot/html/data.txt
rename to web/html/data.txt
diff --git a/docroot/html/files.php b/web/html/files.php
similarity index 100%
rename from docroot/html/files.php
rename to web/html/files.php
diff --git a/docroot/html/functions.php b/web/html/functions.php
similarity index 100%
rename from docroot/html/functions.php
rename to web/html/functions.php
diff --git a/docroot/html/helloworld.php b/web/html/helloworld.php
similarity index 100%
rename from docroot/html/helloworld.php
rename to web/html/helloworld.php
diff --git a/docroot/html/if-structure.php b/web/html/if-structure.php
similarity index 100%
rename from docroot/html/if-structure.php
rename to web/html/if-structure.php
diff --git a/docroot/html/io.php b/web/html/io.php
similarity index 100%
rename from docroot/html/io.php
rename to web/html/io.php
diff --git a/docroot/html/libs/Smarty.class.php b/web/html/libs/Smarty.class.php
similarity index 100%
rename from docroot/html/libs/Smarty.class.php
rename to web/html/libs/Smarty.class.php
diff --git a/docroot/html/libs/debug.tpl b/web/html/libs/debug.tpl
similarity index 100%
rename from docroot/html/libs/debug.tpl
rename to web/html/libs/debug.tpl
diff --git a/docroot/html/libs/plugins/block.php.php b/web/html/libs/plugins/block.php.php
similarity index 100%
rename from docroot/html/libs/plugins/block.php.php
rename to web/html/libs/plugins/block.php.php
diff --git a/docroot/html/libs/plugins/block.textformat.php b/web/html/libs/plugins/block.textformat.php
similarity index 100%
rename from docroot/html/libs/plugins/block.textformat.php
rename to web/html/libs/plugins/block.textformat.php
diff --git a/docroot/html/libs/plugins/function.counter.php b/web/html/libs/plugins/function.counter.php
similarity index 100%
rename from docroot/html/libs/plugins/function.counter.php
rename to web/html/libs/plugins/function.counter.php
diff --git a/docroot/html/libs/plugins/function.cycle.php b/web/html/libs/plugins/function.cycle.php
similarity index 100%
rename from docroot/html/libs/plugins/function.cycle.php
rename to web/html/libs/plugins/function.cycle.php
diff --git a/docroot/html/libs/plugins/function.fetch.php b/web/html/libs/plugins/function.fetch.php
similarity index 100%
rename from docroot/html/libs/plugins/function.fetch.php
rename to web/html/libs/plugins/function.fetch.php
diff --git a/docroot/html/libs/plugins/function.html_checkboxes.php b/web/html/libs/plugins/function.html_checkboxes.php
similarity index 100%
rename from docroot/html/libs/plugins/function.html_checkboxes.php
rename to web/html/libs/plugins/function.html_checkboxes.php
diff --git a/docroot/html/libs/plugins/function.html_image.php b/web/html/libs/plugins/function.html_image.php
similarity index 100%
rename from docroot/html/libs/plugins/function.html_image.php
rename to web/html/libs/plugins/function.html_image.php
diff --git a/docroot/html/libs/plugins/function.html_options.php b/web/html/libs/plugins/function.html_options.php
similarity index 100%
rename from docroot/html/libs/plugins/function.html_options.php
rename to web/html/libs/plugins/function.html_options.php
diff --git a/docroot/html/libs/plugins/function.html_radios.php b/web/html/libs/plugins/function.html_radios.php
similarity index 100%
rename from docroot/html/libs/plugins/function.html_radios.php
rename to web/html/libs/plugins/function.html_radios.php
diff --git a/docroot/html/libs/plugins/function.html_select_date.php b/web/html/libs/plugins/function.html_select_date.php
similarity index 100%
rename from docroot/html/libs/plugins/function.html_select_date.php
rename to web/html/libs/plugins/function.html_select_date.php
diff --git a/docroot/html/libs/plugins/function.html_select_time.php b/web/html/libs/plugins/function.html_select_time.php
similarity index 100%
rename from docroot/html/libs/plugins/function.html_select_time.php
rename to web/html/libs/plugins/function.html_select_time.php
diff --git a/docroot/html/libs/plugins/function.html_table.php b/web/html/libs/plugins/function.html_table.php
similarity index 100%
rename from docroot/html/libs/plugins/function.html_table.php
rename to web/html/libs/plugins/function.html_table.php
diff --git a/docroot/html/libs/plugins/function.mailto.php b/web/html/libs/plugins/function.mailto.php
similarity index 100%
rename from docroot/html/libs/plugins/function.mailto.php
rename to web/html/libs/plugins/function.mailto.php
diff --git a/docroot/html/libs/plugins/function.math.php b/web/html/libs/plugins/function.math.php
similarity index 100%
rename from docroot/html/libs/plugins/function.math.php
rename to web/html/libs/plugins/function.math.php
diff --git a/docroot/html/libs/plugins/function.popup.php b/web/html/libs/plugins/function.popup.php
similarity index 100%
rename from docroot/html/libs/plugins/function.popup.php
rename to web/html/libs/plugins/function.popup.php
diff --git a/docroot/html/libs/plugins/function.popup_init.php b/web/html/libs/plugins/function.popup_init.php
similarity index 100%
rename from docroot/html/libs/plugins/function.popup_init.php
rename to web/html/libs/plugins/function.popup_init.php
diff --git a/docroot/html/libs/plugins/modifier.capitalize.php b/web/html/libs/plugins/modifier.capitalize.php
similarity index 100%
rename from docroot/html/libs/plugins/modifier.capitalize.php
rename to web/html/libs/plugins/modifier.capitalize.php
diff --git a/docroot/html/libs/plugins/modifier.date_format.php b/web/html/libs/plugins/modifier.date_format.php
similarity index 100%
rename from docroot/html/libs/plugins/modifier.date_format.php
rename to web/html/libs/plugins/modifier.date_format.php
diff --git a/docroot/html/libs/plugins/modifier.debug_print_var.php b/web/html/libs/plugins/modifier.debug_print_var.php
similarity index 100%
rename from docroot/html/libs/plugins/modifier.debug_print_var.php
rename to web/html/libs/plugins/modifier.debug_print_var.php
diff --git a/docroot/html/libs/plugins/modifier.escape.php b/web/html/libs/plugins/modifier.escape.php
similarity index 100%
rename from docroot/html/libs/plugins/modifier.escape.php
rename to web/html/libs/plugins/modifier.escape.php
diff --git a/docroot/html/libs/plugins/modifier.regex_replace.php b/web/html/libs/plugins/modifier.regex_replace.php
similarity index 100%
rename from docroot/html/libs/plugins/modifier.regex_replace.php
rename to web/html/libs/plugins/modifier.regex_replace.php
diff --git a/docroot/html/libs/plugins/modifier.replace.php b/web/html/libs/plugins/modifier.replace.php
similarity index 100%
rename from docroot/html/libs/plugins/modifier.replace.php
rename to web/html/libs/plugins/modifier.replace.php
diff --git a/docroot/html/libs/plugins/modifier.spacify.php b/web/html/libs/plugins/modifier.spacify.php
similarity index 100%
rename from docroot/html/libs/plugins/modifier.spacify.php
rename to web/html/libs/plugins/modifier.spacify.php
diff --git a/docroot/html/libs/plugins/modifier.truncate.php b/web/html/libs/plugins/modifier.truncate.php
similarity index 100%
rename from docroot/html/libs/plugins/modifier.truncate.php
rename to web/html/libs/plugins/modifier.truncate.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.cat.php b/web/html/libs/plugins/modifiercompiler.cat.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.cat.php
rename to web/html/libs/plugins/modifiercompiler.cat.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.count_characters.php b/web/html/libs/plugins/modifiercompiler.count_characters.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.count_characters.php
rename to web/html/libs/plugins/modifiercompiler.count_characters.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.count_paragraphs.php b/web/html/libs/plugins/modifiercompiler.count_paragraphs.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.count_paragraphs.php
rename to web/html/libs/plugins/modifiercompiler.count_paragraphs.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.count_sentences.php b/web/html/libs/plugins/modifiercompiler.count_sentences.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.count_sentences.php
rename to web/html/libs/plugins/modifiercompiler.count_sentences.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.count_words.php b/web/html/libs/plugins/modifiercompiler.count_words.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.count_words.php
rename to web/html/libs/plugins/modifiercompiler.count_words.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.default.php b/web/html/libs/plugins/modifiercompiler.default.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.default.php
rename to web/html/libs/plugins/modifiercompiler.default.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.indent.php b/web/html/libs/plugins/modifiercompiler.indent.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.indent.php
rename to web/html/libs/plugins/modifiercompiler.indent.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.lower.php b/web/html/libs/plugins/modifiercompiler.lower.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.lower.php
rename to web/html/libs/plugins/modifiercompiler.lower.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.noprint.php b/web/html/libs/plugins/modifiercompiler.noprint.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.noprint.php
rename to web/html/libs/plugins/modifiercompiler.noprint.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.string_format.php b/web/html/libs/plugins/modifiercompiler.string_format.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.string_format.php
rename to web/html/libs/plugins/modifiercompiler.string_format.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.strip.php b/web/html/libs/plugins/modifiercompiler.strip.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.strip.php
rename to web/html/libs/plugins/modifiercompiler.strip.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.strip_tags.php b/web/html/libs/plugins/modifiercompiler.strip_tags.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.strip_tags.php
rename to web/html/libs/plugins/modifiercompiler.strip_tags.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.upper.php b/web/html/libs/plugins/modifiercompiler.upper.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.upper.php
rename to web/html/libs/plugins/modifiercompiler.upper.php
diff --git a/docroot/html/libs/plugins/modifiercompiler.wordwrap.php b/web/html/libs/plugins/modifiercompiler.wordwrap.php
similarity index 100%
rename from docroot/html/libs/plugins/modifiercompiler.wordwrap.php
rename to web/html/libs/plugins/modifiercompiler.wordwrap.php
diff --git a/docroot/html/libs/plugins/outputfilter.trimwhitespace.php b/web/html/libs/plugins/outputfilter.trimwhitespace.php
similarity index 100%
rename from docroot/html/libs/plugins/outputfilter.trimwhitespace.php
rename to web/html/libs/plugins/outputfilter.trimwhitespace.php
diff --git a/docroot/html/libs/plugins/shared.escape_special_chars.php b/web/html/libs/plugins/shared.escape_special_chars.php
similarity index 100%
rename from docroot/html/libs/plugins/shared.escape_special_chars.php
rename to web/html/libs/plugins/shared.escape_special_chars.php
diff --git a/docroot/html/libs/plugins/shared.make_timestamp.php b/web/html/libs/plugins/shared.make_timestamp.php
similarity index 100%
rename from docroot/html/libs/plugins/shared.make_timestamp.php
rename to web/html/libs/plugins/shared.make_timestamp.php
diff --git a/docroot/html/libs/plugins/variablefilter.htmlspecialchars.php b/web/html/libs/plugins/variablefilter.htmlspecialchars.php
similarity index 100%
rename from docroot/html/libs/plugins/variablefilter.htmlspecialchars.php
rename to web/html/libs/plugins/variablefilter.htmlspecialchars.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_cacheresource_file.php b/web/html/libs/sysplugins/smarty_internal_cacheresource_file.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_cacheresource_file.php
rename to web/html/libs/sysplugins/smarty_internal_cacheresource_file.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_append.php b/web/html/libs/sysplugins/smarty_internal_compile_append.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_append.php
rename to web/html/libs/sysplugins/smarty_internal_compile_append.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_assign.php b/web/html/libs/sysplugins/smarty_internal_compile_assign.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_assign.php
rename to web/html/libs/sysplugins/smarty_internal_compile_assign.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_block.php b/web/html/libs/sysplugins/smarty_internal_compile_block.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_block.php
rename to web/html/libs/sysplugins/smarty_internal_compile_block.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_break.php b/web/html/libs/sysplugins/smarty_internal_compile_break.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_break.php
rename to web/html/libs/sysplugins/smarty_internal_compile_break.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_call.php b/web/html/libs/sysplugins/smarty_internal_compile_call.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_call.php
rename to web/html/libs/sysplugins/smarty_internal_compile_call.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_capture.php b/web/html/libs/sysplugins/smarty_internal_compile_capture.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_capture.php
rename to web/html/libs/sysplugins/smarty_internal_compile_capture.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_config_load.php b/web/html/libs/sysplugins/smarty_internal_compile_config_load.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_config_load.php
rename to web/html/libs/sysplugins/smarty_internal_compile_config_load.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_continue.php b/web/html/libs/sysplugins/smarty_internal_compile_continue.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_continue.php
rename to web/html/libs/sysplugins/smarty_internal_compile_continue.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_debug.php b/web/html/libs/sysplugins/smarty_internal_compile_debug.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_debug.php
rename to web/html/libs/sysplugins/smarty_internal_compile_debug.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_eval.php b/web/html/libs/sysplugins/smarty_internal_compile_eval.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_eval.php
rename to web/html/libs/sysplugins/smarty_internal_compile_eval.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_extends.php b/web/html/libs/sysplugins/smarty_internal_compile_extends.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_extends.php
rename to web/html/libs/sysplugins/smarty_internal_compile_extends.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_for.php b/web/html/libs/sysplugins/smarty_internal_compile_for.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_for.php
rename to web/html/libs/sysplugins/smarty_internal_compile_for.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_foreach.php b/web/html/libs/sysplugins/smarty_internal_compile_foreach.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_foreach.php
rename to web/html/libs/sysplugins/smarty_internal_compile_foreach.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_function.php b/web/html/libs/sysplugins/smarty_internal_compile_function.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_function.php
rename to web/html/libs/sysplugins/smarty_internal_compile_function.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_if.php b/web/html/libs/sysplugins/smarty_internal_compile_if.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_if.php
rename to web/html/libs/sysplugins/smarty_internal_compile_if.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_include.php b/web/html/libs/sysplugins/smarty_internal_compile_include.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_include.php
rename to web/html/libs/sysplugins/smarty_internal_compile_include.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_include_php.php b/web/html/libs/sysplugins/smarty_internal_compile_include_php.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_include_php.php
rename to web/html/libs/sysplugins/smarty_internal_compile_include_php.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_insert.php b/web/html/libs/sysplugins/smarty_internal_compile_insert.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_insert.php
rename to web/html/libs/sysplugins/smarty_internal_compile_insert.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_ldelim.php b/web/html/libs/sysplugins/smarty_internal_compile_ldelim.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_ldelim.php
rename to web/html/libs/sysplugins/smarty_internal_compile_ldelim.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_nocache.php b/web/html/libs/sysplugins/smarty_internal_compile_nocache.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_nocache.php
rename to web/html/libs/sysplugins/smarty_internal_compile_nocache.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/web/html/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
rename to web/html/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/web/html/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
rename to web/html/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_private_modifier.php b/web/html/libs/sysplugins/smarty_internal_compile_private_modifier.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_private_modifier.php
rename to web/html/libs/sysplugins/smarty_internal_compile_private_modifier.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/web/html/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
rename to web/html/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_private_object_function.php b/web/html/libs/sysplugins/smarty_internal_compile_private_object_function.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_private_object_function.php
rename to web/html/libs/sysplugins/smarty_internal_compile_private_object_function.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/web/html/libs/sysplugins/smarty_internal_compile_private_print_expression.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_private_print_expression.php
rename to web/html/libs/sysplugins/smarty_internal_compile_private_print_expression.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/web/html/libs/sysplugins/smarty_internal_compile_private_registered_block.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_private_registered_block.php
rename to web/html/libs/sysplugins/smarty_internal_compile_private_registered_block.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/web/html/libs/sysplugins/smarty_internal_compile_private_registered_function.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_private_registered_function.php
rename to web/html/libs/sysplugins/smarty_internal_compile_private_registered_function.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/web/html/libs/sysplugins/smarty_internal_compile_private_special_variable.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_private_special_variable.php
rename to web/html/libs/sysplugins/smarty_internal_compile_private_special_variable.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_rdelim.php b/web/html/libs/sysplugins/smarty_internal_compile_rdelim.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_rdelim.php
rename to web/html/libs/sysplugins/smarty_internal_compile_rdelim.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_section.php b/web/html/libs/sysplugins/smarty_internal_compile_section.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_section.php
rename to web/html/libs/sysplugins/smarty_internal_compile_section.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compile_while.php b/web/html/libs/sysplugins/smarty_internal_compile_while.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compile_while.php
rename to web/html/libs/sysplugins/smarty_internal_compile_while.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_compilebase.php b/web/html/libs/sysplugins/smarty_internal_compilebase.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_compilebase.php
rename to web/html/libs/sysplugins/smarty_internal_compilebase.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_config.php b/web/html/libs/sysplugins/smarty_internal_config.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_config.php
rename to web/html/libs/sysplugins/smarty_internal_config.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_config_file_compiler.php b/web/html/libs/sysplugins/smarty_internal_config_file_compiler.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_config_file_compiler.php
rename to web/html/libs/sysplugins/smarty_internal_config_file_compiler.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_configfilelexer.php b/web/html/libs/sysplugins/smarty_internal_configfilelexer.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_configfilelexer.php
rename to web/html/libs/sysplugins/smarty_internal_configfilelexer.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_configfileparser.php b/web/html/libs/sysplugins/smarty_internal_configfileparser.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_configfileparser.php
rename to web/html/libs/sysplugins/smarty_internal_configfileparser.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_data.php b/web/html/libs/sysplugins/smarty_internal_data.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_data.php
rename to web/html/libs/sysplugins/smarty_internal_data.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_debug.php b/web/html/libs/sysplugins/smarty_internal_debug.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_debug.php
rename to web/html/libs/sysplugins/smarty_internal_debug.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_filter.php b/web/html/libs/sysplugins/smarty_internal_filter.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_filter.php
rename to web/html/libs/sysplugins/smarty_internal_filter.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_filter_handler.php b/web/html/libs/sysplugins/smarty_internal_filter_handler.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_filter_handler.php
rename to web/html/libs/sysplugins/smarty_internal_filter_handler.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_function_call_handler.php b/web/html/libs/sysplugins/smarty_internal_function_call_handler.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_function_call_handler.php
rename to web/html/libs/sysplugins/smarty_internal_function_call_handler.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_nocache_insert.php b/web/html/libs/sysplugins/smarty_internal_nocache_insert.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_nocache_insert.php
rename to web/html/libs/sysplugins/smarty_internal_nocache_insert.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_parsetree.php b/web/html/libs/sysplugins/smarty_internal_parsetree.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_parsetree.php
rename to web/html/libs/sysplugins/smarty_internal_parsetree.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_register.php b/web/html/libs/sysplugins/smarty_internal_register.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_register.php
rename to web/html/libs/sysplugins/smarty_internal_register.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_resource_eval.php b/web/html/libs/sysplugins/smarty_internal_resource_eval.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_resource_eval.php
rename to web/html/libs/sysplugins/smarty_internal_resource_eval.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_resource_extends.php b/web/html/libs/sysplugins/smarty_internal_resource_extends.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_resource_extends.php
rename to web/html/libs/sysplugins/smarty_internal_resource_extends.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_resource_file.php b/web/html/libs/sysplugins/smarty_internal_resource_file.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_resource_file.php
rename to web/html/libs/sysplugins/smarty_internal_resource_file.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_resource_php.php b/web/html/libs/sysplugins/smarty_internal_resource_php.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_resource_php.php
rename to web/html/libs/sysplugins/smarty_internal_resource_php.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_resource_registered.php b/web/html/libs/sysplugins/smarty_internal_resource_registered.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_resource_registered.php
rename to web/html/libs/sysplugins/smarty_internal_resource_registered.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_resource_stream.php b/web/html/libs/sysplugins/smarty_internal_resource_stream.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_resource_stream.php
rename to web/html/libs/sysplugins/smarty_internal_resource_stream.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_resource_string.php b/web/html/libs/sysplugins/smarty_internal_resource_string.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_resource_string.php
rename to web/html/libs/sysplugins/smarty_internal_resource_string.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/web/html/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
rename to web/html/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_template.php b/web/html/libs/sysplugins/smarty_internal_template.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_template.php
rename to web/html/libs/sysplugins/smarty_internal_template.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_templatecompilerbase.php b/web/html/libs/sysplugins/smarty_internal_templatecompilerbase.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_templatecompilerbase.php
rename to web/html/libs/sysplugins/smarty_internal_templatecompilerbase.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_templatelexer.php b/web/html/libs/sysplugins/smarty_internal_templatelexer.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_templatelexer.php
rename to web/html/libs/sysplugins/smarty_internal_templatelexer.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_templateparser.php b/web/html/libs/sysplugins/smarty_internal_templateparser.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_templateparser.php
rename to web/html/libs/sysplugins/smarty_internal_templateparser.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_utility.php b/web/html/libs/sysplugins/smarty_internal_utility.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_utility.php
rename to web/html/libs/sysplugins/smarty_internal_utility.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_wrapper.php b/web/html/libs/sysplugins/smarty_internal_wrapper.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_wrapper.php
rename to web/html/libs/sysplugins/smarty_internal_wrapper.php
diff --git a/docroot/html/libs/sysplugins/smarty_internal_write_file.php b/web/html/libs/sysplugins/smarty_internal_write_file.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_internal_write_file.php
rename to web/html/libs/sysplugins/smarty_internal_write_file.php
diff --git a/docroot/html/libs/sysplugins/smarty_security.php b/web/html/libs/sysplugins/smarty_security.php
similarity index 100%
rename from docroot/html/libs/sysplugins/smarty_security.php
rename to web/html/libs/sysplugins/smarty_security.php
diff --git a/docroot/html/loops.php b/web/html/loops.php
similarity index 100%
rename from docroot/html/loops.php
rename to web/html/loops.php
diff --git a/docroot/html/mailing.php b/web/html/mailing.php
similarity index 100%
rename from docroot/html/mailing.php
rename to web/html/mailing.php
diff --git a/docroot/html/mysql.php b/web/html/mysql.php
similarity index 100%
rename from docroot/html/mysql.php
rename to web/html/mysql.php
diff --git a/docroot/html/pdo.php b/web/html/pdo.php
similarity index 100%
rename from docroot/html/pdo.php
rename to web/html/pdo.php
diff --git a/docroot/html/phpinfo.php b/web/html/phpinfo.php
similarity index 100%
rename from docroot/html/phpinfo.php
rename to web/html/phpinfo.php
diff --git a/docroot/html/printing.php b/web/html/printing.php
similarity index 100%
rename from docroot/html/printing.php
rename to web/html/printing.php
diff --git a/docroot/html/sessions.php b/web/html/sessions.php
similarity index 100%
rename from docroot/html/sessions.php
rename to web/html/sessions.php
diff --git a/docroot/html/smarty.php b/web/html/smarty.php
similarity index 100%
rename from docroot/html/smarty.php
rename to web/html/smarty.php
diff --git a/docroot/html/templates/test.tpl b/web/html/templates/test.tpl
similarity index 100%
rename from docroot/html/templates/test.tpl
rename to web/html/templates/test.tpl
diff --git a/docroot/html/templates_c/.keep b/web/html/templates_c/.keep
similarity index 100%
rename from docroot/html/templates_c/.keep
rename to web/html/templates_c/.keep
diff --git a/docroot/html/webvars.php b/web/html/webvars.php
similarity index 100%
rename from docroot/html/webvars.php
rename to web/html/webvars.php
diff --git a/docroot/html/writable/.keep b/web/html/writable/.keep
similarity index 100%
rename from docroot/html/writable/.keep
rename to web/html/writable/.keep
diff --git a/docroot/mime.types b/web/mime.types
similarity index 100%
rename from docroot/mime.types
rename to web/mime.types
diff --git a/docroot/nginx.conf.in b/web/nginx.conf.in
similarity index 100%
rename from docroot/nginx.conf.in
rename to web/nginx.conf.in
diff --git a/docroot/php.ini.in b/web/php.ini.in
similarity index 100%
rename from docroot/php.ini.in
rename to web/php.ini.in
diff --git a/docroot/session.save_path/.keep b/web/session.save_path/.keep
similarity index 100%
rename from docroot/session.save_path/.keep
rename to web/session.save_path/.keep
diff --git a/docroot/setup.sql b/web/setup.sql
similarity index 100%
rename from docroot/setup.sql
rename to web/setup.sql
diff --git a/docroot/soap.wsdl_cache_dir/.keep b/web/soap.wsdl_cache_dir/.keep
similarity index 100%
rename from docroot/soap.wsdl_cache_dir/.keep
rename to web/soap.wsdl_cache_dir/.keep
diff --git a/docroot/upload_tmp_dir/.keep b/web/upload_tmp_dir/.keep
similarity index 100%
rename from docroot/upload_tmp_dir/.keep
rename to web/upload_tmp_dir/.keep