diff --git a/GPL_LIB/Smarty/BUGS b/application/class/public/Smarty/BUGS
similarity index 100%
rename from GPL_LIB/Smarty/BUGS
rename to application/class/public/Smarty/BUGS
diff --git a/GPL_LIB/Smarty/COPYING.lib b/application/class/public/Smarty/COPYING.lib
similarity index 100%
rename from GPL_LIB/Smarty/COPYING.lib
rename to application/class/public/Smarty/COPYING.lib
diff --git a/GPL_LIB/Smarty/ChangeLog b/application/class/public/Smarty/ChangeLog
similarity index 100%
rename from GPL_LIB/Smarty/ChangeLog
rename to application/class/public/Smarty/ChangeLog
diff --git a/GPL_LIB/Smarty/FAQ b/application/class/public/Smarty/FAQ
similarity index 100%
rename from GPL_LIB/Smarty/FAQ
rename to application/class/public/Smarty/FAQ
diff --git a/GPL_LIB/Smarty/INSTALL b/application/class/public/Smarty/INSTALL
similarity index 100%
rename from GPL_LIB/Smarty/INSTALL
rename to application/class/public/Smarty/INSTALL
diff --git a/GPL_LIB/Smarty/NEWS b/application/class/public/Smarty/NEWS
similarity index 100%
rename from GPL_LIB/Smarty/NEWS
rename to application/class/public/Smarty/NEWS
diff --git a/GPL_LIB/Smarty/QUICK_START b/application/class/public/Smarty/QUICK_START
similarity index 100%
rename from GPL_LIB/Smarty/QUICK_START
rename to application/class/public/Smarty/QUICK_START
diff --git a/GPL_LIB/Smarty/README b/application/class/public/Smarty/README
similarity index 100%
rename from GPL_LIB/Smarty/README
rename to application/class/public/Smarty/README
diff --git a/GPL_LIB/Smarty/RELEASE_NOTES b/application/class/public/Smarty/RELEASE_NOTES
similarity index 100%
rename from GPL_LIB/Smarty/RELEASE_NOTES
rename to application/class/public/Smarty/RELEASE_NOTES
diff --git a/GPL_LIB/Smarty/TODO b/application/class/public/Smarty/TODO
similarity index 100%
rename from GPL_LIB/Smarty/TODO
rename to application/class/public/Smarty/TODO
diff --git a/GPL_LIB/Smarty/demo/configs/test.conf b/application/class/public/Smarty/demo/configs/test.conf
similarity index 100%
rename from GPL_LIB/Smarty/demo/configs/test.conf
rename to application/class/public/Smarty/demo/configs/test.conf
diff --git a/GPL_LIB/Smarty/demo/index.php b/application/class/public/Smarty/demo/index.php
similarity index 100%
rename from GPL_LIB/Smarty/demo/index.php
rename to application/class/public/Smarty/demo/index.php
diff --git a/GPL_LIB/Smarty/demo/templates/footer.tpl b/application/class/public/Smarty/demo/templates/footer.tpl
similarity index 100%
rename from GPL_LIB/Smarty/demo/templates/footer.tpl
rename to application/class/public/Smarty/demo/templates/footer.tpl
diff --git a/GPL_LIB/Smarty/demo/templates/header.tpl b/application/class/public/Smarty/demo/templates/header.tpl
similarity index 100%
rename from GPL_LIB/Smarty/demo/templates/header.tpl
rename to application/class/public/Smarty/demo/templates/header.tpl
diff --git a/GPL_LIB/Smarty/demo/templates/index.tpl b/application/class/public/Smarty/demo/templates/index.tpl
similarity index 100%
rename from GPL_LIB/Smarty/demo/templates/index.tpl
rename to application/class/public/Smarty/demo/templates/index.tpl
diff --git a/GPL_LIB/Smarty/libs/Config_File.class.php b/application/class/public/Smarty/libs/Config_File.class.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/Config_File.class.php
rename to application/class/public/Smarty/libs/Config_File.class.php
diff --git a/GPL_LIB/Smarty/libs/Smarty.class.php b/application/class/public/Smarty/libs/Smarty.class.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/Smarty.class.php
rename to application/class/public/Smarty/libs/Smarty.class.php
diff --git a/GPL_LIB/Smarty/libs/Smarty_Compiler.class.php b/application/class/public/Smarty/libs/Smarty_Compiler.class.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/Smarty_Compiler.class.php
rename to application/class/public/Smarty/libs/Smarty_Compiler.class.php
diff --git a/GPL_LIB/Smarty/libs/debug.tpl b/application/class/public/Smarty/libs/debug.tpl
similarity index 100%
rename from GPL_LIB/Smarty/libs/debug.tpl
rename to application/class/public/Smarty/libs/debug.tpl
diff --git a/GPL_LIB/Smarty/libs/internals/core.assemble_plugin_filepath.php b/application/class/public/Smarty/libs/internals/core.assemble_plugin_filepath.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.assemble_plugin_filepath.php
rename to application/class/public/Smarty/libs/internals/core.assemble_plugin_filepath.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.assign_smarty_interface.php b/application/class/public/Smarty/libs/internals/core.assign_smarty_interface.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.assign_smarty_interface.php
rename to application/class/public/Smarty/libs/internals/core.assign_smarty_interface.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.create_dir_structure.php b/application/class/public/Smarty/libs/internals/core.create_dir_structure.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.create_dir_structure.php
rename to application/class/public/Smarty/libs/internals/core.create_dir_structure.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.display_debug_console.php b/application/class/public/Smarty/libs/internals/core.display_debug_console.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.display_debug_console.php
rename to application/class/public/Smarty/libs/internals/core.display_debug_console.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.get_include_path.php b/application/class/public/Smarty/libs/internals/core.get_include_path.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.get_include_path.php
rename to application/class/public/Smarty/libs/internals/core.get_include_path.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.get_microtime.php b/application/class/public/Smarty/libs/internals/core.get_microtime.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.get_microtime.php
rename to application/class/public/Smarty/libs/internals/core.get_microtime.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.get_php_resource.php b/application/class/public/Smarty/libs/internals/core.get_php_resource.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.get_php_resource.php
rename to application/class/public/Smarty/libs/internals/core.get_php_resource.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.is_secure.php b/application/class/public/Smarty/libs/internals/core.is_secure.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.is_secure.php
rename to application/class/public/Smarty/libs/internals/core.is_secure.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.is_trusted.php b/application/class/public/Smarty/libs/internals/core.is_trusted.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.is_trusted.php
rename to application/class/public/Smarty/libs/internals/core.is_trusted.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.load_plugins.php b/application/class/public/Smarty/libs/internals/core.load_plugins.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.load_plugins.php
rename to application/class/public/Smarty/libs/internals/core.load_plugins.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.load_resource_plugin.php b/application/class/public/Smarty/libs/internals/core.load_resource_plugin.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.load_resource_plugin.php
rename to application/class/public/Smarty/libs/internals/core.load_resource_plugin.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.process_cached_inserts.php b/application/class/public/Smarty/libs/internals/core.process_cached_inserts.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.process_cached_inserts.php
rename to application/class/public/Smarty/libs/internals/core.process_cached_inserts.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.process_compiled_include.php b/application/class/public/Smarty/libs/internals/core.process_compiled_include.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.process_compiled_include.php
rename to application/class/public/Smarty/libs/internals/core.process_compiled_include.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.read_cache_file.php b/application/class/public/Smarty/libs/internals/core.read_cache_file.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.read_cache_file.php
rename to application/class/public/Smarty/libs/internals/core.read_cache_file.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.rm_auto.php b/application/class/public/Smarty/libs/internals/core.rm_auto.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.rm_auto.php
rename to application/class/public/Smarty/libs/internals/core.rm_auto.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.rmdir.php b/application/class/public/Smarty/libs/internals/core.rmdir.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.rmdir.php
rename to application/class/public/Smarty/libs/internals/core.rmdir.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.run_insert_handler.php b/application/class/public/Smarty/libs/internals/core.run_insert_handler.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.run_insert_handler.php
rename to application/class/public/Smarty/libs/internals/core.run_insert_handler.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.smarty_include_php.php b/application/class/public/Smarty/libs/internals/core.smarty_include_php.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.smarty_include_php.php
rename to application/class/public/Smarty/libs/internals/core.smarty_include_php.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.write_cache_file.php b/application/class/public/Smarty/libs/internals/core.write_cache_file.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.write_cache_file.php
rename to application/class/public/Smarty/libs/internals/core.write_cache_file.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.write_compiled_include.php b/application/class/public/Smarty/libs/internals/core.write_compiled_include.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.write_compiled_include.php
rename to application/class/public/Smarty/libs/internals/core.write_compiled_include.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.write_compiled_resource.php b/application/class/public/Smarty/libs/internals/core.write_compiled_resource.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.write_compiled_resource.php
rename to application/class/public/Smarty/libs/internals/core.write_compiled_resource.php
diff --git a/GPL_LIB/Smarty/libs/internals/core.write_file.php b/application/class/public/Smarty/libs/internals/core.write_file.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/internals/core.write_file.php
rename to application/class/public/Smarty/libs/internals/core.write_file.php
diff --git a/GPL_LIB/Smarty/libs/plugins/block.t.php b/application/class/public/Smarty/libs/plugins/block.t.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/block.t.php
rename to application/class/public/Smarty/libs/plugins/block.t.php
diff --git a/GPL_LIB/Smarty/libs/plugins/block.textformat.php b/application/class/public/Smarty/libs/plugins/block.textformat.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/block.textformat.php
rename to application/class/public/Smarty/libs/plugins/block.textformat.php
diff --git a/GPL_LIB/Smarty/libs/plugins/compiler.assign.php b/application/class/public/Smarty/libs/plugins/compiler.assign.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/compiler.assign.php
rename to application/class/public/Smarty/libs/plugins/compiler.assign.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.assign_debug_info.php b/application/class/public/Smarty/libs/plugins/function.assign_debug_info.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.assign_debug_info.php
rename to application/class/public/Smarty/libs/plugins/function.assign_debug_info.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.config_load.php b/application/class/public/Smarty/libs/plugins/function.config_load.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.config_load.php
rename to application/class/public/Smarty/libs/plugins/function.config_load.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.counter.php b/application/class/public/Smarty/libs/plugins/function.counter.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.counter.php
rename to application/class/public/Smarty/libs/plugins/function.counter.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.cycle.php b/application/class/public/Smarty/libs/plugins/function.cycle.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.cycle.php
rename to application/class/public/Smarty/libs/plugins/function.cycle.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.debug.php b/application/class/public/Smarty/libs/plugins/function.debug.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.debug.php
rename to application/class/public/Smarty/libs/plugins/function.debug.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.eval.php b/application/class/public/Smarty/libs/plugins/function.eval.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.eval.php
rename to application/class/public/Smarty/libs/plugins/function.eval.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.fetch.php b/application/class/public/Smarty/libs/plugins/function.fetch.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.fetch.php
rename to application/class/public/Smarty/libs/plugins/function.fetch.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_checkboxes.php b/application/class/public/Smarty/libs/plugins/function.html_checkboxes.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.html_checkboxes.php
rename to application/class/public/Smarty/libs/plugins/function.html_checkboxes.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_image.php b/application/class/public/Smarty/libs/plugins/function.html_image.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.html_image.php
rename to application/class/public/Smarty/libs/plugins/function.html_image.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_options.php b/application/class/public/Smarty/libs/plugins/function.html_options.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.html_options.php
rename to application/class/public/Smarty/libs/plugins/function.html_options.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_radios.php b/application/class/public/Smarty/libs/plugins/function.html_radios.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.html_radios.php
rename to application/class/public/Smarty/libs/plugins/function.html_radios.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_select_date.php b/application/class/public/Smarty/libs/plugins/function.html_select_date.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.html_select_date.php
rename to application/class/public/Smarty/libs/plugins/function.html_select_date.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_select_time.php b/application/class/public/Smarty/libs/plugins/function.html_select_time.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.html_select_time.php
rename to application/class/public/Smarty/libs/plugins/function.html_select_time.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_table.php b/application/class/public/Smarty/libs/plugins/function.html_table.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.html_table.php
rename to application/class/public/Smarty/libs/plugins/function.html_table.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.mailto.php b/application/class/public/Smarty/libs/plugins/function.mailto.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.mailto.php
rename to application/class/public/Smarty/libs/plugins/function.mailto.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.math.php b/application/class/public/Smarty/libs/plugins/function.math.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.math.php
rename to application/class/public/Smarty/libs/plugins/function.math.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.popup.php b/application/class/public/Smarty/libs/plugins/function.popup.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.popup.php
rename to application/class/public/Smarty/libs/plugins/function.popup.php
diff --git a/GPL_LIB/Smarty/libs/plugins/function.popup_init.php b/application/class/public/Smarty/libs/plugins/function.popup_init.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/function.popup_init.php
rename to application/class/public/Smarty/libs/plugins/function.popup_init.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.capitalize.php b/application/class/public/Smarty/libs/plugins/modifier.capitalize.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.capitalize.php
rename to application/class/public/Smarty/libs/plugins/modifier.capitalize.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.cat.php b/application/class/public/Smarty/libs/plugins/modifier.cat.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.cat.php
rename to application/class/public/Smarty/libs/plugins/modifier.cat.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.count_characters.php b/application/class/public/Smarty/libs/plugins/modifier.count_characters.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.count_characters.php
rename to application/class/public/Smarty/libs/plugins/modifier.count_characters.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.count_paragraphs.php b/application/class/public/Smarty/libs/plugins/modifier.count_paragraphs.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.count_paragraphs.php
rename to application/class/public/Smarty/libs/plugins/modifier.count_paragraphs.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.count_sentences.php b/application/class/public/Smarty/libs/plugins/modifier.count_sentences.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.count_sentences.php
rename to application/class/public/Smarty/libs/plugins/modifier.count_sentences.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.count_words.php b/application/class/public/Smarty/libs/plugins/modifier.count_words.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.count_words.php
rename to application/class/public/Smarty/libs/plugins/modifier.count_words.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.date_format.php b/application/class/public/Smarty/libs/plugins/modifier.date_format.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.date_format.php
rename to application/class/public/Smarty/libs/plugins/modifier.date_format.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.debug_print_var.php b/application/class/public/Smarty/libs/plugins/modifier.debug_print_var.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.debug_print_var.php
rename to application/class/public/Smarty/libs/plugins/modifier.debug_print_var.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.default.php b/application/class/public/Smarty/libs/plugins/modifier.default.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.default.php
rename to application/class/public/Smarty/libs/plugins/modifier.default.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.escape.php b/application/class/public/Smarty/libs/plugins/modifier.escape.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.escape.php
rename to application/class/public/Smarty/libs/plugins/modifier.escape.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.indent.php b/application/class/public/Smarty/libs/plugins/modifier.indent.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.indent.php
rename to application/class/public/Smarty/libs/plugins/modifier.indent.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.lower.php b/application/class/public/Smarty/libs/plugins/modifier.lower.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.lower.php
rename to application/class/public/Smarty/libs/plugins/modifier.lower.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.nl2br.php b/application/class/public/Smarty/libs/plugins/modifier.nl2br.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.nl2br.php
rename to application/class/public/Smarty/libs/plugins/modifier.nl2br.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.regex_replace.php b/application/class/public/Smarty/libs/plugins/modifier.regex_replace.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.regex_replace.php
rename to application/class/public/Smarty/libs/plugins/modifier.regex_replace.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.replace.php b/application/class/public/Smarty/libs/plugins/modifier.replace.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.replace.php
rename to application/class/public/Smarty/libs/plugins/modifier.replace.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.spacify.php b/application/class/public/Smarty/libs/plugins/modifier.spacify.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.spacify.php
rename to application/class/public/Smarty/libs/plugins/modifier.spacify.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.string_format.php b/application/class/public/Smarty/libs/plugins/modifier.string_format.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.string_format.php
rename to application/class/public/Smarty/libs/plugins/modifier.string_format.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.strip.php b/application/class/public/Smarty/libs/plugins/modifier.strip.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.strip.php
rename to application/class/public/Smarty/libs/plugins/modifier.strip.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.strip_tags.php b/application/class/public/Smarty/libs/plugins/modifier.strip_tags.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.strip_tags.php
rename to application/class/public/Smarty/libs/plugins/modifier.strip_tags.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.truncate.php b/application/class/public/Smarty/libs/plugins/modifier.truncate.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.truncate.php
rename to application/class/public/Smarty/libs/plugins/modifier.truncate.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.upper.php b/application/class/public/Smarty/libs/plugins/modifier.upper.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.upper.php
rename to application/class/public/Smarty/libs/plugins/modifier.upper.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.wordwrap.php b/application/class/public/Smarty/libs/plugins/modifier.wordwrap.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/modifier.wordwrap.php
rename to application/class/public/Smarty/libs/plugins/modifier.wordwrap.php
diff --git a/GPL_LIB/Smarty/libs/plugins/outputfilter.trimwhitespace.php b/application/class/public/Smarty/libs/plugins/outputfilter.trimwhitespace.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/outputfilter.trimwhitespace.php
rename to application/class/public/Smarty/libs/plugins/outputfilter.trimwhitespace.php
diff --git a/GPL_LIB/Smarty/libs/plugins/shared.escape_special_chars.php b/application/class/public/Smarty/libs/plugins/shared.escape_special_chars.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/shared.escape_special_chars.php
rename to application/class/public/Smarty/libs/plugins/shared.escape_special_chars.php
diff --git a/GPL_LIB/Smarty/libs/plugins/shared.make_timestamp.php b/application/class/public/Smarty/libs/plugins/shared.make_timestamp.php
similarity index 100%
rename from GPL_LIB/Smarty/libs/plugins/shared.make_timestamp.php
rename to application/class/public/Smarty/libs/plugins/shared.make_timestamp.php
diff --git a/GPL_LIB/Smarty/misc/smarty_icon.README b/application/class/public/Smarty/misc/smarty_icon.README
similarity index 100%
rename from GPL_LIB/Smarty/misc/smarty_icon.README
rename to application/class/public/Smarty/misc/smarty_icon.README
diff --git a/GPL_LIB/Smarty/misc/smarty_icon.gif b/application/class/public/Smarty/misc/smarty_icon.gif
similarity index 100%
rename from GPL_LIB/Smarty/misc/smarty_icon.gif
rename to application/class/public/Smarty/misc/smarty_icon.gif
diff --git a/GPL_LIB/Smarty/unit_test/README b/application/class/public/Smarty/unit_test/README
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/README
rename to application/class/public/Smarty/unit_test/README
diff --git a/GPL_LIB/Smarty/unit_test/config.php b/application/class/public/Smarty/unit_test/config.php
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/config.php
rename to application/class/public/Smarty/unit_test/config.php
diff --git a/GPL_LIB/Smarty/unit_test/configs/globals_double_quotes.conf b/application/class/public/Smarty/unit_test/configs/globals_double_quotes.conf
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/configs/globals_double_quotes.conf
rename to application/class/public/Smarty/unit_test/configs/globals_double_quotes.conf
diff --git a/GPL_LIB/Smarty/unit_test/configs/globals_single_quotes.conf b/application/class/public/Smarty/unit_test/configs/globals_single_quotes.conf
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/configs/globals_single_quotes.conf
rename to application/class/public/Smarty/unit_test/configs/globals_single_quotes.conf
diff --git a/GPL_LIB/Smarty/unit_test/smarty_unit_test.php b/application/class/public/Smarty/unit_test/smarty_unit_test.php
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/smarty_unit_test.php
rename to application/class/public/Smarty/unit_test/smarty_unit_test.php
diff --git a/GPL_LIB/Smarty/unit_test/smarty_unit_test_gui.php b/application/class/public/Smarty/unit_test/smarty_unit_test_gui.php
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/smarty_unit_test_gui.php
rename to application/class/public/Smarty/unit_test/smarty_unit_test_gui.php
diff --git a/GPL_LIB/Smarty/unit_test/templates/assign_var.tpl b/application/class/public/Smarty/unit_test/templates/assign_var.tpl
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/templates/assign_var.tpl
rename to application/class/public/Smarty/unit_test/templates/assign_var.tpl
diff --git a/GPL_LIB/Smarty/unit_test/templates/constant.tpl b/application/class/public/Smarty/unit_test/templates/constant.tpl
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/templates/constant.tpl
rename to application/class/public/Smarty/unit_test/templates/constant.tpl
diff --git a/GPL_LIB/Smarty/unit_test/templates/index.tpl b/application/class/public/Smarty/unit_test/templates/index.tpl
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/templates/index.tpl
rename to application/class/public/Smarty/unit_test/templates/index.tpl
diff --git a/GPL_LIB/Smarty/unit_test/templates/parse_math.tpl b/application/class/public/Smarty/unit_test/templates/parse_math.tpl
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/templates/parse_math.tpl
rename to application/class/public/Smarty/unit_test/templates/parse_math.tpl
diff --git a/GPL_LIB/Smarty/unit_test/templates/parse_obj_meth.tpl b/application/class/public/Smarty/unit_test/templates/parse_obj_meth.tpl
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/templates/parse_obj_meth.tpl
rename to application/class/public/Smarty/unit_test/templates/parse_obj_meth.tpl
diff --git a/GPL_LIB/Smarty/unit_test/test_cases.php b/application/class/public/Smarty/unit_test/test_cases.php
similarity index 100%
rename from GPL_LIB/Smarty/unit_test/test_cases.php
rename to application/class/public/Smarty/unit_test/test_cases.php
diff --git a/www/header.php b/www/header.php
index 619d8acedf116897eb6b92549c6e199fd1fd2a84..fbad16cc451ab1faf4e8a665a37b3a294f9f4db9 100644
--- a/www/header.php
+++ b/www/header.php
@@ -49,7 +49,7 @@ $advanced_search = 0;
 /*
  * Define
  */
-define('SMARTY_DIR', realpath('../GPL_LIB/Smarty/libs/') . '/');
+define('SMARTY_DIR', realpath('../application/class/public/Smarty/libs/') . '/');
 
 /*
  * Include
diff --git a/www/include/configuration/configObject/command/formArguments.php b/www/include/configuration/configObject/command/formArguments.php
index 40c68d84a3afadc34885eb15e9949d0934a8941f..b69301a441901f88c412edfc7da8e66b65089f2f 100644
--- a/www/include/configuration/configObject/command/formArguments.php
+++ b/www/include/configuration/configObject/command/formArguments.php
@@ -92,14 +92,14 @@ $subS = $form->addElement('button', 'close', _("Close"), array("onClick"=>"close
 /*
  *  Smarty template
  */
-define('SMARTY_DIR', "$centreon_path/GPL_LIB/Smarty/libs/");
+define('SMARTY_DIR', "$centreon_path/application/class/public/Smarty/libs/");
 require_once SMARTY_DIR."Smarty.class.php";
 
 $tpl = new Smarty();
 $tpl->template_dir = $path;
-$tpl->compile_dir = "$centreon_path/GPL_LIB/SmartyCache/compile";
-$tpl->config_dir = "$centreon_path/GPL_LIB/SmartyCache/config";
-$tpl->cache_dir = "$centreon_path/GPL_LIB/SmartyCache/cache";
+$tpl->compile_dir = "$centreon_path/var/Smarty/compile";
+$tpl->config_dir = "$centreon_path/var/Smarty/config";
+$tpl->cache_dir = "$centreon_path/var/Smarty/cache";
 $tpl->caching = 0;
 $tpl->compile_check = true;
 $tpl->force_compile = true;
diff --git a/www/include/monitoring/external_cmd/popup/popup.php b/www/include/monitoring/external_cmd/popup/popup.php
index 268873bc42d51a79ab584c7e9d4c575ed67a9feb..ab6a64d6735f1b8e8f2fb44a84ca22980f2d1190 100644
--- a/www/include/monitoring/external_cmd/popup/popup.php
+++ b/www/include/monitoring/external_cmd/popup/popup.php
@@ -31,9 +31,6 @@
  *
  * For more information : contact@centreon.com
  *
- * SVN : $URL
- * SVN : $Id$
- *
  */
 
 	require_once "@CENTREON_ETC@/centreon.conf.php";
@@ -65,7 +62,7 @@
 		exit;
 	}
 
-	define('SMARTY_DIR', $centreon_path . 'GPL_LIB/Smarty/libs/');
+	define('SMARTY_DIR', $centreon_path . 'application/class/public/Smarty/libs/');
 
 	require_once SMARTY_DIR . "Smarty.class.php";