diff --git a/.gitignore b/.gitignore
index 67f0dc51..97b7377d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,7 @@ phpunit*
 .phpunit.result.cache
 vendor/*
 composer.lock
+/src/Lexer/ConfigfileLexer.php
+/src/Lexer/TemplateLexer.php
+/src/Parser/ConfigfileParser.php
+/src/Parser/TemplateParser.php
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..38afdbf1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+all: lexers parsers
+
+lexers: src/Lexer/ConfigfileLexer.php src/Lexer/TemplateLexer.php
+parsers: src/Parser/ConfigfileParser.php src/Parser/TemplateParser.php
+
+src/Lexer/ConfigfileLexer.php: src/Lexer/ConfigfileLexer.plex
+	php ./utilities/make-lexer.php src/Lexer/ConfigfileLexer.plex src/Lexer/ConfigfileLexer.php
+
+src/Lexer/TemplateLexer.php: src/Lexer/TemplateLexer.plex
+	php ./utilities/make-lexer.php src/Lexer/TemplateLexer.plex src/Lexer/TemplateLexer.php
+
+src/Parser/ConfigfileParser.php: src/Parser/ConfigfileParser.y
+	php ./utilities/make-parser.php src/Parser/ConfigfileParser.y src/Parser/ConfigfileParser.php
+
+src/Parser/TemplateParser.php: src/Parser/TemplateParser.y
+	php ./utilities/make-parser.php src/Parser/TemplateParser.y src/Parser/TemplateParser.php
+
+clean:
+	rm -f src/Lexer/ConfigfileLexer.php src/Lexer/TemplateLexer.php src/Parser/ConfigfileParser.php src/Parser/TemplateParser.php
\ No newline at end of file
diff --git a/TODO.txt b/TODO.txt
index c0b575d4..e7e61a8d 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,9 +1,7 @@
-- [ ] \Smarty\Cacheresource\Base::load generates classnames that are now invalid
-- [ ] \Smarty\Resource\BasePlugin::load generates classnames that are now invalid
-- [ ] consistent ConfigFile Configfile
-
+## Data, TemplateBase, Smarty, Template, Debug, DataObject mess:
 - [ ] review usages of ->_getSmartyObj and ->smarty: maybe change this so we can hide more
 - [ ] ->_objType and ->objMap
 - [ ] refactor _isTplObj, _isDataObj
+- [ ] look for and remove @method  and @property phpdoc tags
+
 - [ ] remove `require_once` calls from tests/*, especially where they load files from the demo dir
-- [ ] look for and remove @method  and @property phpdoc tags
\ No newline at end of file
diff --git a/composer.json b/composer.json
index e6cfafa9..df463a86 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,10 @@
     "autoload": {
         "psr-4" : {
             "Smarty\\" : "src/"
-        }
+        },
+        "files": [
+            "src/functions.php"
+        ]
     },
     "extra": {
         "branch-alias": {
@@ -45,6 +48,12 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5 || ^7.5",
-        "smarty/smarty-lexer": "^3.1"
-    }
+        "smarty/smarty-lexer": "@dev"
+    },
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../smarty-lexer/"
+        }
+    ]
 }
diff --git a/plugins/modifiercompiler.count_characters.php b/plugins/modifiercompiler.count_characters.php
deleted file mode 100644
index 78a0f50f..00000000
--- a/plugins/modifiercompiler.count_characters.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_characters modifier plugin
- * Type:     modifier
- * Name:     count_characters
- * Purpose:  count the number of characters in a text
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
- *         manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_characters($params)
-{
-    if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
-        return 'preg_match_all(\'/[^\s]/' . \Smarty\Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
-    }
-    return 'mb_strlen(' . $params[ 0 ] . ', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
-}
diff --git a/plugins/modifiercompiler.count_paragraphs.php b/plugins/modifiercompiler.count_paragraphs.php
deleted file mode 100644
index 33240296..00000000
--- a/plugins/modifiercompiler.count_paragraphs.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_paragraphs modifier plugin
- * Type:     modifier
- * Name:     count_paragraphs
- * Purpose:  count the number of paragraphs in a text
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_paragraphs (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_paragraphs($params)
-{
-    // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
-}
diff --git a/plugins/modifiercompiler.count_sentences.php b/plugins/modifiercompiler.count_sentences.php
deleted file mode 100644
index d188c292..00000000
--- a/plugins/modifiercompiler.count_sentences.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_sentences modifier plugin
- * Type:     modifier
- * Name:     count_sentences
- * Purpose:  count the number of sentences in a text
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_sentences (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_sentences($params)
-{
-    // find periods, question marks, exclamation marks with a word before but not after.
-    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . \Smarty\Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
-}
diff --git a/plugins/modifiercompiler.count_words.php b/plugins/modifiercompiler.count_words.php
deleted file mode 100644
index afccf02d..00000000
--- a/plugins/modifiercompiler.count_words.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_words modifier plugin
- * Type:     modifier
- * Name:     count_words
- * Purpose:  count the number of words in a text
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_words($params)
-{
-    // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
-    return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . \Smarty\Smarty::$_UTF8_MODIFIER . '\', ' .
-           $params[ 0 ] . ', $tmp)';
-}
diff --git a/plugins/modifiercompiler.default.php b/plugins/modifiercompiler.default.php
deleted file mode 100644
index dffa7a98..00000000
--- a/plugins/modifiercompiler.default.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty default modifier plugin
- * Type:     modifier
- * Name:     default
- * Purpose:  designate default value for empty variables
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_default($params)
-{
-    $output = $params[ 0 ];
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = "''";
-    }
-    array_shift($params);
-    foreach ($params as $param) {
-        $output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
-    }
-    return $output;
-}
diff --git a/plugins/modifiercompiler.escape.php b/plugins/modifiercompiler.escape.php
deleted file mode 100644
index 1c9b024b..00000000
--- a/plugins/modifiercompiler.escape.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-use Smarty\Exception;
-
-/**
- * Smarty escape modifier plugin
- * Type:     modifier
- * Name:     escape
- * Purpose:  escape string for output
- *
- * @link   https://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
- * @author Rodney Rehm
- *
- * @param array                                $params parameters
- * @param \Smarty\Compiler\Template $compiler
- *
- * @return string with compiled code
- * @throws Exception
- */
-function smarty_modifiercompiler_escape($params, \Smarty\Compiler\Template $compiler)
-{
-    try {
-        $esc_type = smarty_literal_compiler_param($params, 1, 'html');
-        $char_set = smarty_literal_compiler_param($params, 2, \Smarty\Smarty::$_CHARSET);
-        $double_encode = smarty_literal_compiler_param($params, 3, true);
-        if (!$char_set) {
-            $char_set = \Smarty\Smarty::$_CHARSET;
-        }
-        switch ($esc_type) {
-            case 'html':
-                return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
-                    var_export($double_encode, true) . ')';
-            // no break
-            case 'htmlall':
-                return 'htmlentities(mb_convert_encoding((string)' . $params[ 0 ] . ', \'UTF-8\', ' .
-                    var_export($char_set, true) . '), ENT_QUOTES, \'UTF-8\', ' .
-                    var_export($double_encode, true) . ')';
-            // no break
-            case 'url':
-                return 'rawurlencode((string)' . $params[ 0 ] . ')';
-            case 'urlpathinfo':
-                return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
-            case 'quotes':
-                // escape unescaped single quotes
-                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'", (string)' . $params[ 0 ] . ')';
-            case 'javascript':
-                // escape quotes and backslashes, newlines, etc.
-                // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
-                return 'strtr((string)' .
-                       $params[ 0 ] .
-                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S" ))';
-        }
-    } catch (Exception $e) {
-        // pass through to regular plugin fallback
-    }
-    return 'smarty_modifier_escape(' . join(', ', $params) . ')';
-}
diff --git a/plugins/modifiercompiler.from_charset.php b/plugins/modifiercompiler.from_charset.php
deleted file mode 100644
index 40299b98..00000000
--- a/plugins/modifiercompiler.from_charset.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty from_charset modifier plugin
- * Type:     modifier
- * Name:     from_charset
- * Purpose:  convert character encoding from $charset to internal encoding
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_from_charset($params)
-{
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = '"ISO-8859-1"';
-    }
-    return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(\Smarty\Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
-}
diff --git a/plugins/modifiercompiler.indent.php b/plugins/modifiercompiler.indent.php
deleted file mode 100644
index 636f0edf..00000000
--- a/plugins/modifiercompiler.indent.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty indent modifier plugin
- * Type:     modifier
- * Name:     indent
- * Purpose:  indent lines of text
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_indent($params)
-{
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 4;
-    }
-    if (!isset($params[ 2 ])) {
-        $params[ 2 ] = "' '";
-    }
-    return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
-}
diff --git a/plugins/modifiercompiler.lower.php b/plugins/modifiercompiler.lower.php
deleted file mode 100644
index 4f900873..00000000
--- a/plugins/modifiercompiler.lower.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty lower modifier plugin
- * Type:     modifier
- * Name:     lower
- * Purpose:  convert string to lowercase
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_lower($params)
-{
-    return 'mb_strtolower(' . $params[ 0 ] . ', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
-}
diff --git a/plugins/modifiercompiler.nl2br.php b/plugins/modifiercompiler.nl2br.php
deleted file mode 100644
index 308c00e4..00000000
--- a/plugins/modifiercompiler.nl2br.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty nl2br modifier plugin
- * Type:     modifier
- * Name:     nl2br
- * Purpose:  insert HTML line breaks before all newlines in a string
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.nl2br.tpl nl2br (Smarty online manual)
-  *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_nl2br($params) {
-    return 'nl2br((string) ' . $params[0] . ', (bool) ' . ($params[1] ?? true) . ')';
-}
diff --git a/plugins/modifiercompiler.noprint.php b/plugins/modifiercompiler.noprint.php
deleted file mode 100644
index 1275190e..00000000
--- a/plugins/modifiercompiler.noprint.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty noprint modifier plugin
- * Type:     modifier
- * Name:     noprint
- * Purpose:  return an empty string
- *
- * @author Uwe Tews
- * @return string with compiled code
- */
-function smarty_modifiercompiler_noprint()
-{
-    return "''";
-}
diff --git a/plugins/modifiercompiler.round.php b/plugins/modifiercompiler.round.php
deleted file mode 100644
index 97f072f0..00000000
--- a/plugins/modifiercompiler.round.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty round modifier plugin
- * Type:     modifier
- * Name:     round
- * Purpose:  Returns the rounded value of num to specified precision (number of digits after the decimal point)
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.round.tpl round (Smarty online manual)
-  *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_round($params) {
-    return 'round((float) ' . $params[0] . ', (int) ' . ($params[1] ?? 0) . ', (int) ' . ($params[2] ?? PHP_ROUND_HALF_UP) . ')';
-}
diff --git a/plugins/modifiercompiler.str_repeat.php b/plugins/modifiercompiler.str_repeat.php
deleted file mode 100644
index 18eb7a76..00000000
--- a/plugins/modifiercompiler.str_repeat.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty str_repeat modifier plugin
- * Type:     modifier
- * Name:     str_repeat
- * Purpose:  returns string repeated times times
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.str_repeat.tpl str_repeat (Smarty online manual)
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_str_repeat($params) {
-    return 'str_repeat((string) ' . $params[0] . ', (int) ' . $params[1] . ')';
-}
diff --git a/plugins/modifiercompiler.string_format.php b/plugins/modifiercompiler.string_format.php
deleted file mode 100644
index 8df5632c..00000000
--- a/plugins/modifiercompiler.string_format.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty string_format modifier plugin
- * Type:     modifier
- * Name:     string_format
- * Purpose:  format strings via sprintf
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_string_format($params)
-{
-    return 'sprintf(' . $params[ 1 ] . ',' . $params[ 0 ] . ')';
-}
diff --git a/plugins/modifiercompiler.strip_tags.php b/plugins/modifiercompiler.strip_tags.php
deleted file mode 100644
index bd866a61..00000000
--- a/plugins/modifiercompiler.strip_tags.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty strip_tags modifier plugin
- * Type:     modifier
- * Name:     strip_tags
- * Purpose:  strip html tags from text
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_strip_tags($params)
-{
-    if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
-        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]} ?: '')";
-    } else {
-        return 'strip_tags((string) ' . $params[ 0 ] . ')';
-    }
-}
diff --git a/plugins/modifiercompiler.strlen.php b/plugins/modifiercompiler.strlen.php
deleted file mode 100644
index d43e8ef1..00000000
--- a/plugins/modifiercompiler.strlen.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty strlen modifier plugin
- * Type:     modifier
- * Name:     strlen
- * Purpose:  return the length of the given string
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.strlen.tpl strlen (Smarty online manual)
-  *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_strlen($params) {
-    return 'strlen((string) ' . $params[0] . ')';
-}
diff --git a/plugins/modifiercompiler.to_charset.php b/plugins/modifiercompiler.to_charset.php
deleted file mode 100644
index 17543a04..00000000
--- a/plugins/modifiercompiler.to_charset.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty to_charset modifier plugin
- * Type:     modifier
- * Name:     to_charset
- * Purpose:  convert character encoding from internal encoding to $charset
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_to_charset($params)
-{
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = '"ISO-8859-1"';
-    }
-    return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(\Smarty\Smarty::$_CHARSET) . '")';
-}
diff --git a/plugins/modifiercompiler.unescape.php b/plugins/modifiercompiler.unescape.php
deleted file mode 100644
index ba53e53a..00000000
--- a/plugins/modifiercompiler.unescape.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty unescape modifier plugin
- * Type:     modifier
- * Name:     unescape
- * Purpose:  unescape html entities
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- * @param \Smarty\Compiler\Template $compiler
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_unescape($params, \Smarty\Compiler\Template $compiler)
-{
-    $esc_type = smarty_literal_compiler_param($params, 1, 'html');
-
-    if (!isset($params[ 2 ])) {
-        $params[ 2 ] = '\'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\'';
-    }
-
-    switch ($esc_type) {
-        case 'entity':
-        case 'htmlall':
-            return 'html_entity_decode(mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'UTF-8\'), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
-        case 'html':
-            return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
-        case 'url':
-            return 'rawurldecode(' . $params[ 0 ] . ')';
-        default:
-            return $params[ 0 ];
-    }
-}
diff --git a/plugins/modifiercompiler.upper.php b/plugins/modifiercompiler.upper.php
deleted file mode 100644
index c8237409..00000000
--- a/plugins/modifiercompiler.upper.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty upper modifier plugin
- * Type:     modifier
- * Name:     lower
- * Purpose:  convert string to uppercase
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_upper($params)
-{
-    return 'mb_strtoupper(' . $params[ 0 ] . ' ?? \'\', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
-}
diff --git a/plugins/modifiercompiler.wordwrap.php b/plugins/modifiercompiler.wordwrap.php
deleted file mode 100644
index 6434276a..00000000
--- a/plugins/modifiercompiler.wordwrap.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty wordwrap modifier plugin
- * Type:     modifier
- * Name:     wordwrap
- * Purpose:  wrap a string of text at a given length
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array                                 $params parameters
- * @param \Smarty\Compiler\Template $compiler
- *
- * @return string with compiled code
- * @throws \Smarty\Exception
- */
-function smarty_modifiercompiler_wordwrap($params, \Smarty\Compiler\Template $compiler)
-{
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 80;
-    }
-    if (!isset($params[ 2 ])) {
-        $params[ 2 ] = '"\n"';
-    }
-    if (!isset($params[ 3 ])) {
-        $params[ 3 ] = 'false';
-    }
-    $function = $compiler->getPlugin('mb_wordwrap', 'modifier');
-    return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
-}
diff --git a/plugins/shared.literal_compiler_param.php b/plugins/shared.literal_compiler_param.php
deleted file mode 100644
index bc368739..00000000
--- a/plugins/shared.literal_compiler_param.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-use Smarty\Exception;
-
-/**
- * evaluate compiler parameter
- *
- * @param array   $params  parameter array as given to the compiler function
- * @param integer $index   array index of the parameter to convert
- * @param mixed   $default value to be returned if the parameter is not present
- *
- * @return mixed evaluated value of parameter or $default
- * @throws Exception if parameter is not a literal (but an expression, variable, …)
- * @author Rodney Rehm
- */
-function smarty_literal_compiler_param($params, $index, $default = null)
-{
-    // not set, go default
-    if (!isset($params[ $index ])) {
-        return $default;
-    }
-    // test if param is a literal
-    if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[ $index ])) {
-        throw new Exception(
-            '$param[' . $index .
-            '] is not a literal and is thus not evaluatable at compile time'
-        );
-    }
-    $t = null;
-    eval("\$t = " . $params[ $index ] . ";");
-    return $t;
-}
diff --git a/src/Cacheresource/Base.php b/src/Cacheresource/Base.php
index 3cf2b7c4..623f3c08 100644
--- a/src/Cacheresource/Base.php
+++ b/src/Cacheresource/Base.php
@@ -27,7 +27,7 @@ abstract class Base
      *
      * @var array
      */
-    protected static $sysplugins = array('file' => 'File.php',);
+    protected static $sysplugins = ['file' => \Smarty\Cacheresource\File::class];
 
     /**
      * populate Cached Object with meta data from Resource
@@ -211,7 +211,7 @@ abstract class Base
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
-            $cache_resource_class = 'Smarty_Internal_CacheResource_' . \smarty_ucfirst_ascii($type);
+            $cache_resource_class = self::$sysplugins[ $type ];
             return $smarty->_cacheresource_handlers[ $type ] = new $cache_resource_class();
         }
         // try plugins dir
diff --git a/src/Compile/Call.php b/src/Compile/Call.php
deleted file mode 100644
index 452c5a0a..00000000
--- a/src/Compile/Call.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function_Call
- * Compiles the calls of user defined tags defined by {function}
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-use Smarty\Compile\Base;
-
-/**
- * Smarty Internal Plugin Compile Function_Call Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Call extends Base
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Base
-     */
-    public $required_attributes = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Base
-     */
-    public $shorttag_order = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Base
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles the calls of user defined tags defined by {function}
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // save possible attributes
-        if (isset($_attr[ 'assign' ])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr[ 'assign' ];
-        }
-        //$_name = trim($_attr['name'], "''");
-        $_name = $_attr[ 'name' ];
-        unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'nocache' ]);
-        // set flag (compiled code of {function} must be included in cache file
-        if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
-            $_nocache = 'true';
-        } else {
-            $_nocache = 'false';
-        }
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $_params = 'array(' . implode(',', $_paramsArray) . ')';
-        //$compiler->suppressNocacheProcessing = true;
-        // was there an assign attribute
-        if (isset($_assign)) {
-            $_output =
-                "<?php ob_start();\n\$_smarty_tpl->smarty->getRuntime('TplFunction')->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-        } else {
-            $_output =
-                "<?php \$_smarty_tpl->smarty->getRuntime('TplFunction')->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
-        }
-        return $_output;
-    }
-}
diff --git a/src/Compile/Modifier/Base.php b/src/Compile/Modifier/Base.php
new file mode 100644
index 00000000..c67b017e
--- /dev/null
+++ b/src/Compile/Modifier/Base.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+use Smarty\Exception;
+
+abstract class Base {
+
+	/**
+	 * Compiles code for the modifier
+	 *
+	 * @param array                                 $params      array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler  compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	abstract public function compile($params, \Smarty\Compiler\Template $compiler);
+
+	/**
+	 * evaluate compiler parameter
+	 *
+	 * @param array   $params  parameter array as given to the compiler function
+	 * @param integer $index   array index of the parameter to convert
+	 * @param mixed   $default value to be returned if the parameter is not present
+	 *
+	 * @return mixed evaluated value of parameter or $default
+	 * @throws Exception if parameter is not a literal (but an expression, variable, …)
+	 * @author Rodney Rehm
+	 */
+	protected function literal_compiler_param($params, $index, $default = null)
+	{
+		// not set, go default
+		if (!isset($params[ $index ])) {
+			return $default;
+		}
+		// test if param is a literal
+		if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[ $index ])) {
+			throw new Exception(
+				'$param[' . $index .
+				'] is not a literal and is thus not evaluatable at compile time'
+			);
+		}
+		$t = null;
+		eval("\$t = " . $params[ $index ] . ";");
+		return $t;
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/modifiercompiler.cat.php b/src/Compile/Modifier/CatModifierCompiler.php
similarity index 57%
rename from plugins/modifiercompiler.cat.php
rename to src/Compile/Modifier/CatModifierCompiler.php
index 2c3a8b2a..f7cc2589 100644
--- a/plugins/modifiercompiler.cat.php
+++ b/src/Compile/Modifier/CatModifierCompiler.php
@@ -1,10 +1,7 @@
 <?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
+
+namespace Smarty\Compile\Modifier;
+
 /**
  * Smarty cat modifier plugin
  * Type:     modifier
@@ -17,12 +14,14 @@
  * @link   https://www.smarty.net/manual/en/language.modifier.cat.php cat
  *           (Smarty online manual)
  * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
  */
-function smarty_modifiercompiler_cat($params)
-{
-    return '(' . implode(').(', $params) . ')';
+
+class CatModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return '(' . implode(').(', $params) . ')';
+	}
+
 }
+
+
diff --git a/src/Compile/Modifier/CountCharactersModifierCompiler.php b/src/Compile/Modifier/CountCharactersModifierCompiler.php
new file mode 100644
index 00000000..6411a55a
--- /dev/null
+++ b/src/Compile/Modifier/CountCharactersModifierCompiler.php
@@ -0,0 +1,23 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_characters modifier plugin
+ * Type:     modifier
+ * Name:     count_characters
+ * Purpose:  count the number of characters in a text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
+ *         manual)
+ * @author Uwe Tews
+ */
+
+class CountCharactersModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
+			return 'preg_match_all(\'/[^\s]/' . \Smarty\Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
+		}
+		return 'mb_strlen(' . $params[ 0 ] . ', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/CountParagraphsModifierCompiler.php b/src/Compile/Modifier/CountParagraphsModifierCompiler.php
new file mode 100644
index 00000000..f67e64a3
--- /dev/null
+++ b/src/Compile/Modifier/CountParagraphsModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_paragraphs modifier plugin
+ * Type:     modifier
+ * Name:     count_paragraphs
+ * Purpose:  count the number of paragraphs in a text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ *          count_paragraphs (Smarty online manual)
+ * @author Uwe Tews
+ */
+
+class CountParagraphsModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		// count \r or \n characters
+		return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/CountSentencesModifierCompiler.php b/src/Compile/Modifier/CountSentencesModifierCompiler.php
new file mode 100644
index 00000000..503d63f1
--- /dev/null
+++ b/src/Compile/Modifier/CountSentencesModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_sentences modifier plugin
+ * Type:     modifier
+ * Name:     count_sentences
+ * Purpose:  count the number of sentences in a text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ *          count_sentences (Smarty online manual)
+ * @author Uwe Tews
+ */
+
+class CountSentencesModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		// find periods, question marks, exclamation marks with a word before but not after.
+		return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . \Smarty\Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/CountWordsModifierCompiler.php b/src/Compile/Modifier/CountWordsModifierCompiler.php
new file mode 100644
index 00000000..e1c648ab
--- /dev/null
+++ b/src/Compile/Modifier/CountWordsModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_words modifier plugin
+ * Type:     modifier
+ * Name:     count_words
+ * Purpose:  count the number of words in a text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
+ * @author Uwe Tews
+ */
+
+class CountWordsModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		// expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
+		return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . \Smarty\Smarty::$_UTF8_MODIFIER . '\', ' .
+			$params[ 0 ] . ', $tmp)';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/DefaultModifierCompiler.php b/src/Compile/Modifier/DefaultModifierCompiler.php
new file mode 100644
index 00000000..f802e4d5
--- /dev/null
+++ b/src/Compile/Modifier/DefaultModifierCompiler.php
@@ -0,0 +1,27 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty default modifier plugin
+ * Type:     modifier
+ * Name:     default
+ * Purpose:  designate default value for empty variables
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
+ * @author Uwe Tews
+ */
+
+class DefaultModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		$output = $params[ 0 ];
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = "''";
+		}
+		array_shift($params);
+		foreach ($params as $param) {
+			$output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
+		}
+		return $output;
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/EscapeModifierCompiler.php b/src/Compile/Modifier/EscapeModifierCompiler.php
new file mode 100644
index 00000000..0c839232
--- /dev/null
+++ b/src/Compile/Modifier/EscapeModifierCompiler.php
@@ -0,0 +1,55 @@
+<?php
+namespace Smarty\Compile\Modifier;
+
+use Smarty\Exception;
+
+/**
+ * Smarty escape modifier plugin
+ * Type:     modifier
+ * Name:     escape
+ * Purpose:  escape string for output
+ *
+ * @link   https://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
+ * @author Rodney Rehm
+ */
+
+class EscapeModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		try {
+			$esc_type = $this->literal_compiler_param($params, 1, 'html');
+			$char_set = $this->literal_compiler_param($params, 2, \Smarty\Smarty::$_CHARSET);
+			$double_encode = $this->literal_compiler_param($params, 3, true);
+			if (!$char_set) {
+				$char_set = \Smarty\Smarty::$_CHARSET;
+			}
+			switch ($esc_type) {
+				case 'html':
+					return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+						var_export($double_encode, true) . ')';
+				// no break
+				case 'htmlall':
+					return 'htmlentities(mb_convert_encoding((string)' . $params[ 0 ] . ', \'UTF-8\', ' .
+						var_export($char_set, true) . '), ENT_QUOTES, \'UTF-8\', ' .
+						var_export($double_encode, true) . ')';
+				// no break
+				case 'url':
+					return 'rawurlencode((string)' . $params[ 0 ] . ')';
+				case 'urlpathinfo':
+					return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
+				case 'quotes':
+					// escape unescaped single quotes
+					return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'", (string)' . $params[ 0 ] . ')';
+				case 'javascript':
+					// escape quotes and backslashes, newlines, etc.
+					// see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+					return 'strtr((string)' .
+						$params[ 0 ] .
+						', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S" ))';
+			}
+		} catch (Exception $e) {
+			// pass through to regular plugin fallback
+		}
+		return 'smarty_modifier_escape(' . join(', ', $params) . ')';
+	}
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/FromCharsetModifierCompiler.php b/src/Compile/Modifier/FromCharsetModifierCompiler.php
new file mode 100644
index 00000000..606fedf9
--- /dev/null
+++ b/src/Compile/Modifier/FromCharsetModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty from_charset modifier plugin
+ * Type:     modifier
+ * Name:     from_charset
+ * Purpose:  convert character encoding from $charset to internal encoding
+ *
+ * @author Rodney Rehm
+ */
+
+class FromCharsetModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = '"ISO-8859-1"';
+		}
+		return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(\Smarty\Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/IndentModifierCompiler.php b/src/Compile/Modifier/IndentModifierCompiler.php
new file mode 100644
index 00000000..401e24a1
--- /dev/null
+++ b/src/Compile/Modifier/IndentModifierCompiler.php
@@ -0,0 +1,25 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty indent modifier plugin
+ * Type:     modifier
+ * Name:     indent
+ * Purpose:  indent lines of text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
+ * @author Uwe Tews
+ */
+
+class IndentModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = 4;
+		}
+		if (!isset($params[ 2 ])) {
+			$params[ 2 ] = "' '";
+		}
+		return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/LowerModifierCompiler.php b/src/Compile/Modifier/LowerModifierCompiler.php
new file mode 100644
index 00000000..7b95ffc6
--- /dev/null
+++ b/src/Compile/Modifier/LowerModifierCompiler.php
@@ -0,0 +1,20 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty lower modifier plugin
+ * Type:     modifier
+ * Name:     lower
+ * Purpose:  convert string to lowercase
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ */
+
+class LowerModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'mb_strtolower(' . $params[ 0 ] . ', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/Nl2brModifierCompiler.php b/src/Compile/Modifier/Nl2brModifierCompiler.php
new file mode 100644
index 00000000..074e6772
--- /dev/null
+++ b/src/Compile/Modifier/Nl2brModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty nl2br modifier plugin
+ * Type:     modifier
+ * Name:     nl2br
+ * Purpose:  insert HTML line breaks before all newlines in a string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.nl2br.tpl nl2br (Smarty online manual)
+ */
+
+class Nl2brModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'nl2br((string) ' . $params[0] . ', (bool) ' . ($params[1] ?? true) . ')';
+	}
+}
diff --git a/src/Compile/Modifier/NoPrintModifierCompiler.php b/src/Compile/Modifier/NoPrintModifierCompiler.php
new file mode 100644
index 00000000..c9401cfe
--- /dev/null
+++ b/src/Compile/Modifier/NoPrintModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty noprint modifier plugin
+ * Type:     modifier
+ * Name:     noprint
+ * Purpose:  return an empty string
+ *
+ * @author Uwe Tews
+ */
+
+class NoPrintModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return "''";
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/RoundModifierCompiler.php b/src/Compile/Modifier/RoundModifierCompiler.php
new file mode 100644
index 00000000..33645ea0
--- /dev/null
+++ b/src/Compile/Modifier/RoundModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty round modifier plugin
+ * Type:     modifier
+ * Name:     round
+ * Purpose:  Returns the rounded value of num to specified precision (number of digits after the decimal point)
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.round.tpl round (Smarty online manual)
+ */
+
+class RoundModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'round((float) ' . $params[0] . ', (int) ' . ($params[1] ?? 0) . ', (int) ' . ($params[2] ?? PHP_ROUND_HALF_UP) . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/StrRepeatModifierCompiler.php b/src/Compile/Modifier/StrRepeatModifierCompiler.php
new file mode 100644
index 00000000..dbe4ba77
--- /dev/null
+++ b/src/Compile/Modifier/StrRepeatModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty str_repeat modifier plugin
+ * Type:     modifier
+ * Name:     str_repeat
+ * Purpose:  returns string repeated times times
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.str_repeat.tpl str_repeat (Smarty online manual)
+ */
+
+class StrRepeatModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'str_repeat((string) ' . $params[0] . ', (int) ' . $params[1] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/StringFormatModifierCompiler.php b/src/Compile/Modifier/StringFormatModifierCompiler.php
new file mode 100644
index 00000000..a0c23ae5
--- /dev/null
+++ b/src/Compile/Modifier/StringFormatModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty string_format modifier plugin
+ * Type:     modifier
+ * Name:     string_format
+ * Purpose:  format strings via sprintf
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+ * @author Uwe Tews
+ */
+
+class StringFormatModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'sprintf(' . $params[ 1 ] . ',' . $params[ 0 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/modifiercompiler.strip.php b/src/Compile/Modifier/StripModifierCompiler.php
similarity index 51%
rename from plugins/modifiercompiler.strip.php
rename to src/Compile/Modifier/StripModifierCompiler.php
index 6c4dacf5..78871640 100644
--- a/plugins/modifiercompiler.strip.php
+++ b/src/Compile/Modifier/StripModifierCompiler.php
@@ -1,10 +1,5 @@
 <?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
+namespace Smarty\Compile\Modifier;
 /**
  * Smarty strip modifier plugin
  * Type:     modifier
@@ -16,15 +11,15 @@
  *
  * @link   https://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
  * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
  */
-function smarty_modifiercompiler_strip($params)
-{
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = "' '";
-    }
-    return "preg_replace('!\s+!" . \Smarty\Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
-}
+
+class StripModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = "' '";
+		}
+		return "preg_replace('!\s+!" . \Smarty\Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/StripTagsModifierCompiler.php b/src/Compile/Modifier/StripTagsModifierCompiler.php
new file mode 100644
index 00000000..f724f773
--- /dev/null
+++ b/src/Compile/Modifier/StripTagsModifierCompiler.php
@@ -0,0 +1,23 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty strip_tags modifier plugin
+ * Type:     modifier
+ * Name:     strip_tags
+ * Purpose:  strip html tags from text
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
+ * @author Uwe Tews
+ */
+
+class StripTagsModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
+			return "preg_replace('!<[^>]*?>!', ' ', {$params[0]} ?: '')";
+		} else {
+			return 'strip_tags((string) ' . $params[ 0 ] . ')';
+		}
+	}
+
+}
diff --git a/src/Compile/Modifier/StrlenModifierCompiler.php b/src/Compile/Modifier/StrlenModifierCompiler.php
new file mode 100644
index 00000000..07a44718
--- /dev/null
+++ b/src/Compile/Modifier/StrlenModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty strlen modifier plugin
+ * Type:     modifier
+ * Name:     strlen
+ * Purpose:  return the length of the given string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.strlen.tpl strlen (Smarty online manual)
+ */
+
+class StrlenModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'strlen((string) ' . $params[0] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/ToCharsetModifierCompiler.php b/src/Compile/Modifier/ToCharsetModifierCompiler.php
new file mode 100644
index 00000000..67a5709d
--- /dev/null
+++ b/src/Compile/Modifier/ToCharsetModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty to_charset modifier plugin
+ * Type:     modifier
+ * Name:     to_charset
+ * Purpose:  convert character encoding from internal encoding to $charset
+ *
+ * @author Rodney Rehm
+ */
+
+class ToCharsetModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = '"ISO-8859-1"';
+		}
+		return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(\Smarty\Smarty::$_CHARSET) . '")';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/UnescapeModifierCompiler.php b/src/Compile/Modifier/UnescapeModifierCompiler.php
new file mode 100644
index 00000000..1844ceb9
--- /dev/null
+++ b/src/Compile/Modifier/UnescapeModifierCompiler.php
@@ -0,0 +1,34 @@
+<?php
+namespace Smarty\Compile\Modifier;
+
+/**
+ * Smarty unescape modifier plugin
+ * Type:     modifier
+ * Name:     unescape
+ * Purpose:  unescape html entities
+ *
+ * @author Rodney Rehm
+ */
+
+class UnescapeModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		$esc_type = $this->literal_compiler_param($params, 1, 'html');
+
+		if (!isset($params[ 2 ])) {
+			$params[ 2 ] = '\'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\'';
+		}
+
+		switch ($esc_type) {
+			case 'entity':
+			case 'htmlall':
+				return 'html_entity_decode(mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'UTF-8\'), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
+			case 'html':
+				return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
+			case 'url':
+				return 'rawurldecode(' . $params[ 0 ] . ')';
+			default:
+				return $params[ 0 ];
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compile/Modifier/UpperModifierCompiler.php b/src/Compile/Modifier/UpperModifierCompiler.php
new file mode 100644
index 00000000..c658fc5e
--- /dev/null
+++ b/src/Compile/Modifier/UpperModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty upper modifier plugin
+ * Type:     modifier
+ * Name:     lower
+ * Purpose:  convert string to uppercase
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
+ * @author Uwe Tews
+ */
+
+class UpperModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'mb_strtoupper(' . $params[ 0 ] . ' ?? \'\', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
+	}
+
+}
diff --git a/src/Compile/Modifier/WordWrapModifierCompiler.php b/src/Compile/Modifier/WordWrapModifierCompiler.php
new file mode 100644
index 00000000..a20f2da3
--- /dev/null
+++ b/src/Compile/Modifier/WordWrapModifierCompiler.php
@@ -0,0 +1,29 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty wordwrap modifier plugin
+ * Type:     modifier
+ * Name:     wordwrap
+ * Purpose:  wrap a string of text at a given length
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
+ * @author Uwe Tews
+ */
+
+class WordWrapModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = 80;
+		}
+		if (!isset($params[ 2 ])) {
+			$params[ 2 ] = '"\n"';
+		}
+		if (!isset($params[ 3 ])) {
+			$params[ 3 ] = 'false';
+		}
+		$function = $compiler->getPlugin('mb_wordwrap', 'modifier');
+		return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/src/Compile/Append.php b/src/Compile/Tag/Append.php
similarity index 98%
rename from src/Compile/Append.php
rename to src/Compile/Tag/Append.php
index 92bcd291..6d7f1a93 100644
--- a/src/Compile/Append.php
+++ b/src/Compile/Tag/Append.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Append
diff --git a/src/Compile/Assign.php b/src/Compile/Tag/Assign.php
similarity index 97%
rename from src/Compile/Assign.php
rename to src/Compile/Tag/Assign.php
index ea81bd5f..83fe3da0 100644
--- a/src/Compile/Assign.php
+++ b/src/Compile/Tag/Assign.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
-use Smarty\CompileBase;
 use Smarty\Smarty;
 
 /**
@@ -20,7 +19,7 @@ use Smarty\Smarty;
  * @package    Smarty
  * @subpackage Compiler
  */
-class Assign extends CompileBase
+class Assign extends Base
 {
     /**
      * Attribute definition: Overwrites base class.
diff --git a/src/Compile/Base.php b/src/Compile/Tag/Base.php
similarity index 98%
rename from src/Compile/Base.php
rename to src/Compile/Tag/Base.php
index 3d136961..59f3fb98 100644
--- a/src/Compile/Base.php
+++ b/src/Compile/Tag/Base.php
@@ -1,13 +1,9 @@
 <?php
 /**
- * Smarty Internal Plugin CompileBase
- *
- * @package    Smarty
- * @subpackage Compiler
+ * Smarty Internal Compile Plugin Base
  * @author     Uwe Tews
  */
-
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 /**
  * This class does extend all internal compile plugins
  *
diff --git a/src/Compile/Block.php b/src/Compile/Tag/Block.php
similarity index 98%
rename from src/Compile/Block.php
rename to src/Compile/Tag/Block.php
index fef47b81..2bac1a46 100644
--- a/src/Compile/Block.php
+++ b/src/Compile/Tag/Block.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 use Smarty\ParseTree\Template;
 
diff --git a/src/Compile/BlockChild.php b/src/Compile/Tag/BlockChild.php
similarity index 93%
rename from src/Compile/BlockChild.php
rename to src/Compile/Tag/BlockChild.php
index 0c50d21f..8d6870b5 100644
--- a/src/Compile/BlockChild.php
+++ b/src/Compile/Tag/BlockChild.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Block Child Class
diff --git a/src/Compile/BlockClose.php b/src/Compile/Tag/BlockClose.php
similarity index 99%
rename from src/Compile/BlockClose.php
rename to src/Compile/Tag/BlockClose.php
index f8f4a8bc..bd0af275 100644
--- a/src/Compile/BlockClose.php
+++ b/src/Compile/Tag/BlockClose.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 use Smarty\ParseTree\Template;
 
diff --git a/src/Compile/BlockParent.php b/src/Compile/Tag/BlockParent.php
similarity index 94%
rename from src/Compile/BlockParent.php
rename to src/Compile/Tag/BlockParent.php
index f713c73c..276032aa 100644
--- a/src/Compile/BlockParent.php
+++ b/src/Compile/Tag/BlockParent.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Block Parent Class
diff --git a/src/Compile/BreakTag.php b/src/Compile/Tag/BreakTag.php
similarity index 99%
rename from src/Compile/BreakTag.php
rename to src/Compile/Tag/BreakTag.php
index c25180ac..8c22c6a5 100644
--- a/src/Compile/BreakTag.php
+++ b/src/Compile/Tag/BreakTag.php
@@ -8,7 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Break Class
diff --git a/src/Compile/Tag/Call.php b/src/Compile/Tag/Call.php
new file mode 100644
index 00000000..eaf31014
--- /dev/null
+++ b/src/Compile/Tag/Call.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function_Call
+ * Compiles the calls of user defined tags defined by {function}
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Function_Call Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Call extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Base
+	 */
+	public $required_attributes = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Base
+	 */
+	public $shorttag_order = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Base
+	 */
+	public $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles the calls of user defined tags defined by {function}
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		// save possible attributes
+		if (isset($_attr['assign'])) {
+			// output will be stored in a smarty variable instead of being displayed
+			$_assign = $_attr['assign'];
+		}
+		//$_name = trim($_attr['name'], "''");
+		$_name = $_attr['name'];
+		unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
+		// set flag (compiled code of {function} must be included in cache file
+		if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
+			$_nocache = 'true';
+		} else {
+			$_nocache = 'false';
+		}
+		$_paramsArray = [];
+		foreach ($_attr as $_key => $_value) {
+			if (is_int($_key)) {
+				$_paramsArray[] = "$_key=>$_value";
+			} else {
+				$_paramsArray[] = "'$_key'=>$_value";
+			}
+		}
+		$_params = 'array(' . implode(',', $_paramsArray) . ')';
+		//$compiler->suppressNocacheProcessing = true;
+		// was there an assign attribute
+		if (isset($_assign)) {
+			$_output =
+				"<?php ob_start();\n\$_smarty_tpl->smarty->getRuntime('TplFunction')->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+		} else {
+			$_output =
+				"<?php \$_smarty_tpl->smarty->getRuntime('TplFunction')->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
+		}
+		return $_output;
+	}
+}
diff --git a/src/Compile/Capture.php b/src/Compile/Tag/Capture.php
similarity index 98%
rename from src/Compile/Capture.php
rename to src/Compile/Tag/Capture.php
index 38ecd58a..460786fb 100644
--- a/src/Compile/Capture.php
+++ b/src/Compile/Tag/Capture.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Capture Class
diff --git a/src/Compile/CaptureClose.php b/src/Compile/Tag/CaptureClose.php
similarity index 94%
rename from src/Compile/CaptureClose.php
rename to src/Compile/Tag/CaptureClose.php
index 270af0d4..9455bcfa 100644
--- a/src/Compile/CaptureClose.php
+++ b/src/Compile/Tag/CaptureClose.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Captureclose Class
diff --git a/src/Compile/Child.php b/src/Compile/Tag/Child.php
similarity index 97%
rename from src/Compile/Child.php
rename to src/Compile/Tag/Child.php
index e8ff1e71..f3b5c650 100644
--- a/src/Compile/Child.php
+++ b/src/Compile/Tag/Child.php
@@ -8,9 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Child Class
diff --git a/src/Compile/ConfigLoad.php b/src/Compile/Tag/ConfigLoad.php
similarity index 94%
rename from src/Compile/ConfigLoad.php
rename to src/Compile/Tag/ConfigLoad.php
index fc30aa39..c31778e4 100644
--- a/src/Compile/ConfigLoad.php
+++ b/src/Compile/Tag/ConfigLoad.php
@@ -8,10 +8,9 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 use Smarty\Smarty;
-use Smarty\Compiler\Template;
 
 /**
  * Smarty Internal Plugin Compile Config Load Class
@@ -89,6 +88,6 @@ class ConfigLoad extends Base {
 			$_scope = $compiler->convertScope($_attr, $this->valid_scopes);
 		}
 		// create config object
-		return "<?php\n\$_smarty_tpl->_loadConfigFile({$conf_file}, {$section}, {$_scope});\n?>\n";
+		return "<?php\n\$_smarty_tpl->_loadConfigfile({$conf_file}, {$section}, {$_scope});\n?>\n";
 	}
 }
diff --git a/src/Compile/ContinueTag.php b/src/Compile/Tag/ContinueTag.php
similarity index 87%
rename from src/Compile/ContinueTag.php
rename to src/Compile/Tag/ContinueTag.php
index 12e60232..f5a3f3dd 100644
--- a/src/Compile/ContinueTag.php
+++ b/src/Compile/Tag/ContinueTag.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compile\BreakTag;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Continue Class
diff --git a/src/Compile/Debug.php b/src/Compile/Tag/Debug.php
similarity index 94%
rename from src/Compile/Debug.php
rename to src/Compile/Tag/Debug.php
index f0c1dee9..42c9a12e 100644
--- a/src/Compile/Debug.php
+++ b/src/Compile/Tag/Debug.php
@@ -9,9 +9,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Debug Class
diff --git a/src/Compile/ElseIfTag.php b/src/Compile/Tag/ElseIfTag.php
similarity index 98%
rename from src/Compile/ElseIfTag.php
rename to src/Compile/Tag/ElseIfTag.php
index fa7d930f..ec5f1605 100644
--- a/src/Compile/ElseIfTag.php
+++ b/src/Compile/Tag/ElseIfTag.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile ElseIf Class
diff --git a/src/Compile/ElseTag.php b/src/Compile/Tag/ElseTag.php
similarity index 92%
rename from src/Compile/ElseTag.php
rename to src/Compile/Tag/ElseTag.php
index 1da16733..8633ae19 100644
--- a/src/Compile/ElseTag.php
+++ b/src/Compile/Tag/ElseTag.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Else Class
diff --git a/src/Compile/EvalTag.php b/src/Compile/Tag/EvalTag.php
similarity index 95%
rename from src/Compile/EvalTag.php
rename to src/Compile/Tag/EvalTag.php
index 916b6617..98fd5722 100644
--- a/src/Compile/EvalTag.php
+++ b/src/Compile/Tag/EvalTag.php
@@ -8,10 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compile\Base;
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Eval Class
diff --git a/src/Compile/ExtendsTag.php b/src/Compile/Tag/ExtendsTag.php
similarity index 98%
rename from src/Compile/ExtendsTag.php
rename to src/Compile/Tag/ExtendsTag.php
index 9ddc97ac..6d32142e 100644
--- a/src/Compile/ExtendsTag.php
+++ b/src/Compile/Tag/ExtendsTag.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile extend Class
diff --git a/src/Compile/ForClose.php b/src/Compile/Tag/ForClose.php
similarity index 94%
rename from src/Compile/ForClose.php
rename to src/Compile/Tag/ForClose.php
index 677731ec..810f59dd 100644
--- a/src/Compile/ForClose.php
+++ b/src/Compile/Tag/ForClose.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Forclose Class
diff --git a/src/Compile/ForElse.php b/src/Compile/Tag/ForElse.php
similarity index 92%
rename from src/Compile/ForElse.php
rename to src/Compile/Tag/ForElse.php
index 134f275f..1fa22b02 100644
--- a/src/Compile/ForElse.php
+++ b/src/Compile/Tag/ForElse.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Forelse Class
diff --git a/src/Compile/ForTag.php b/src/Compile/Tag/ForTag.php
similarity index 98%
rename from src/Compile/ForTag.php
rename to src/Compile/Tag/ForTag.php
index 6f0cd9d7..0164996b 100644
--- a/src/Compile/ForTag.php
+++ b/src/Compile/Tag/ForTag.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile For Class
diff --git a/src/Compile/ForeachClose.php b/src/Compile/Tag/ForeachClose.php
similarity index 93%
rename from src/Compile/ForeachClose.php
rename to src/Compile/Tag/ForeachClose.php
index 64aed079..d620f496 100644
--- a/src/Compile/ForeachClose.php
+++ b/src/Compile/Tag/ForeachClose.php
@@ -8,7 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Foreachclose Class
@@ -41,7 +41,7 @@ class ForeachClose extends Base {
 			$output .= "{$itemVar} = {$local}saved;\n";
 		}
 		$output .= "}\n";
-		/* @var \Smarty\Compile\ForeachTag $foreachCompiler */
+		/* @var \Smarty\Compile\Tag\ForeachTag $foreachCompiler */
 		$foreachCompiler = $compiler->getTagCompiler('foreach');
 		$output .= $foreachCompiler->compileRestore(1);
 		$output .= "?>";
diff --git a/src/Compile/ForeachElse.php b/src/Compile/Tag/ForeachElse.php
similarity index 94%
rename from src/Compile/ForeachElse.php
rename to src/Compile/Tag/ForeachElse.php
index 7ef3916f..cb89fb01 100644
--- a/src/Compile/ForeachElse.php
+++ b/src/Compile/Tag/ForeachElse.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Foreachelse Class
diff --git a/src/Compile/ForeachSection.php b/src/Compile/Tag/ForeachSection.php
similarity index 98%
rename from src/Compile/ForeachSection.php
rename to src/Compile/Tag/ForeachSection.php
index 0f57498c..b419fe9c 100644
--- a/src/Compile/ForeachSection.php
+++ b/src/Compile/Tag/ForeachSection.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile ForeachSection Class
diff --git a/src/Compile/ForeachTag.php b/src/Compile/Tag/ForeachTag.php
similarity index 99%
rename from src/Compile/ForeachTag.php
rename to src/Compile/Tag/ForeachTag.php
index 2253dc45..e528499b 100644
--- a/src/Compile/ForeachTag.php
+++ b/src/Compile/Tag/ForeachTag.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Foreach Class
diff --git a/src/Compile/FunctionClose.php b/src/Compile/Tag/FunctionClose.php
similarity index 98%
rename from src/Compile/FunctionClose.php
rename to src/Compile/Tag/FunctionClose.php
index 83d5f8e2..a343fdee 100644
--- a/src/Compile/FunctionClose.php
+++ b/src/Compile/Tag/FunctionClose.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Functionclose Class
@@ -64,7 +62,7 @@ class FunctionClose extends Base {
 		// setup buffer for template function code
 		$compiler->parser->current_buffer = new \Smarty\ParseTree\Template();
 		$_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
-		$_funcNameCaching = $_funcName . 'Smarty\Compile\Nocache';
+		$_funcNameCaching = $_funcName . 'Smarty\Compile\Tag\Nocache';
 		if ($compiler->template->compiled->has_nocache_code) {
 			$compiler->parent_compiler->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
 			$output = "<?php\n";
diff --git a/src/Compile/FunctionTag.php b/src/Compile/Tag/FunctionTag.php
similarity index 96%
rename from src/Compile/FunctionTag.php
rename to src/Compile/Tag/FunctionTag.php
index 06903f85..f9a506f3 100644
--- a/src/Compile/FunctionTag.php
+++ b/src/Compile/Tag/FunctionTag.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Function Class
diff --git a/src/Compile/IfClose.php b/src/Compile/Tag/IfClose.php
similarity index 89%
rename from src/Compile/IfClose.php
rename to src/Compile/Tag/IfClose.php
index a6423b3b..1fcd12d8 100644
--- a/src/Compile/IfClose.php
+++ b/src/Compile/Tag/IfClose.php
@@ -8,11 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compile\Assign;
-use Smarty\Compile\Base;
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Ifclose Class
diff --git a/src/Compile/IfTag.php b/src/Compile/Tag/IfTag.php
similarity index 97%
rename from src/Compile/IfTag.php
rename to src/Compile/Tag/IfTag.php
index caef6b96..6032cc72 100644
--- a/src/Compile/IfTag.php
+++ b/src/Compile/Tag/IfTag.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile If Class
diff --git a/src/Compile/IncludeTag.php b/src/Compile/Tag/IncludeTag.php
similarity index 99%
rename from src/Compile/IncludeTag.php
rename to src/Compile/Tag/IncludeTag.php
index ae924357..26167000 100644
--- a/src/Compile/IncludeTag.php
+++ b/src/Compile/Tag/IncludeTag.php
@@ -8,11 +8,10 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 use Smarty\Compiler\Template;
 use Smarty\Smarty;
-use Smarty\Compile\Base;
 use Smarty\Template\Compiled;
 
 /**
diff --git a/src/Compile/Inheritance.php b/src/Compile/Tag/Inheritance.php
similarity index 95%
rename from src/Compile/Inheritance.php
rename to src/Compile/Tag/Inheritance.php
index 2523a180..a058b67b 100644
--- a/src/Compile/Inheritance.php
+++ b/src/Compile/Tag/Inheritance.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Shared Inheritance
@@ -17,7 +17,7 @@ namespace Smarty\Compile;
  * @package    Smarty
  * @subpackage Compiler
  */
-abstract class Inheritance extends \Smarty\Compile\Base
+abstract class Inheritance extends Base
 {
     /**
      * Compile inheritance initialization code as prefix
diff --git a/src/Compile/Insert.php b/src/Compile/Tag/Insert.php
similarity index 98%
rename from src/Compile/Insert.php
rename to src/Compile/Tag/Insert.php
index f9845c82..80d3e76c 100644
--- a/src/Compile/Insert.php
+++ b/src/Compile/Tag/Insert.php
@@ -8,10 +8,9 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 use Smarty\Variable;
-use Smarty\Compiler\Template;
 
 /**
  * Smarty Internal Plugin Compile Insert Class
diff --git a/src/Compile/Ldelim.php b/src/Compile/Tag/Ldelim.php
similarity index 94%
rename from src/Compile/Ldelim.php
rename to src/Compile/Tag/Ldelim.php
index 066794e9..7e9ab5f1 100644
--- a/src/Compile/Ldelim.php
+++ b/src/Compile/Tag/Ldelim.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Ldelim Class
diff --git a/src/Compile/MakeNocache.php b/src/Compile/Tag/MakeNocache.php
similarity index 94%
rename from src/Compile/MakeNocache.php
rename to src/Compile/Tag/MakeNocache.php
index c034b799..ad7ba804 100644
--- a/src/Compile/MakeNocache.php
+++ b/src/Compile/Tag/MakeNocache.php
@@ -8,10 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compile\Base;
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Make_Nocache Class
diff --git a/src/Compile/Nocache.php b/src/Compile/Tag/Nocache.php
similarity index 93%
rename from src/Compile/Nocache.php
rename to src/Compile/Tag/Nocache.php
index e27ba7c3..457b8afc 100644
--- a/src/Compile/Nocache.php
+++ b/src/Compile/Tag/Nocache.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Nocache Class
diff --git a/src/Compile/NocacheClose.php b/src/Compile/Tag/NocacheClose.php
similarity index 94%
rename from src/Compile/NocacheClose.php
rename to src/Compile/Tag/NocacheClose.php
index 20f4d97d..a5b75d95 100644
--- a/src/Compile/NocacheClose.php
+++ b/src/Compile/Tag/NocacheClose.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Nocacheclose Class
diff --git a/src/Compile/ParentTag.php b/src/Compile/Tag/ParentTag.php
similarity index 94%
rename from src/Compile/ParentTag.php
rename to src/Compile/Tag/ParentTag.php
index fc0b40a5..a71ccdf0 100644
--- a/src/Compile/ParentTag.php
+++ b/src/Compile/Tag/ParentTag.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Parent Class
diff --git a/src/Compile/PrivateBlockPlugin.php b/src/Compile/Tag/PrivateBlockPlugin.php
similarity index 98%
rename from src/Compile/PrivateBlockPlugin.php
rename to src/Compile/Tag/PrivateBlockPlugin.php
index 80718cc8..48eb01ad 100644
--- a/src/Compile/PrivateBlockPlugin.php
+++ b/src/Compile/Tag/PrivateBlockPlugin.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Block Plugin Class
diff --git a/src/Compile/PrivateFunctionPlugin.php b/src/Compile/Tag/PrivateFunctionPlugin.php
similarity index 95%
rename from src/Compile/PrivateFunctionPlugin.php
rename to src/Compile/Tag/PrivateFunctionPlugin.php
index 3ec9980d..222398e0 100644
--- a/src/Compile/PrivateFunctionPlugin.php
+++ b/src/Compile/Tag/PrivateFunctionPlugin.php
@@ -8,10 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compile\Base;
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Function Plugin Class
diff --git a/src/Compile/PrivateModifier.php b/src/Compile/Tag/PrivateModifier.php
similarity index 93%
rename from src/Compile/PrivateModifier.php
rename to src/Compile/Tag/PrivateModifier.php
index 461f7889..c33af67e 100644
--- a/src/Compile/PrivateModifier.php
+++ b/src/Compile/Tag/PrivateModifier.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Modifier Class
@@ -81,11 +79,8 @@ class PrivateModifier extends Base {
 					case 3:
 						// modifiercompiler plugin
 						// check if modifier allowed
-						if (!is_object($compiler->smarty->security_policy)
-							|| $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
-						) {
-							$plugin = 'smarty_modifiercompiler_' . $modifier;
-							$output = $plugin($single_modifier, $compiler);
+						if ($compiler->getModifierCompiler($modifier)) {
+							$output = $compiler->compileModifier($modifier, $single_modifier);
 						}
 						$compiler->known_modifier_type[$modifier] = $type;
 						break 2;
diff --git a/src/Compile/PrivateObjectBlockFunction.php b/src/Compile/Tag/PrivateObjectBlockFunction.php
similarity index 97%
rename from src/Compile/PrivateObjectBlockFunction.php
rename to src/Compile/Tag/PrivateObjectBlockFunction.php
index 71f54453..424654c7 100644
--- a/src/Compile/PrivateObjectBlockFunction.php
+++ b/src/Compile/Tag/PrivateObjectBlockFunction.php
@@ -8,7 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 use Smarty\Compiler\Template;
 
diff --git a/src/Compile/PrivateObjectFunction.php b/src/Compile/Tag/PrivateObjectFunction.php
similarity index 97%
rename from src/Compile/PrivateObjectFunction.php
rename to src/Compile/Tag/PrivateObjectFunction.php
index dbd67833..65163f30 100644
--- a/src/Compile/PrivateObjectFunction.php
+++ b/src/Compile/Tag/PrivateObjectFunction.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Object Function Class
diff --git a/src/Compile/PrivatePrintExpression.php b/src/Compile/Tag/PrivatePrintExpression.php
similarity index 98%
rename from src/Compile/PrivatePrintExpression.php
rename to src/Compile/Tag/PrivatePrintExpression.php
index 6eba7281..bf53d841 100644
--- a/src/Compile/PrivatePrintExpression.php
+++ b/src/Compile/Tag/PrivatePrintExpression.php
@@ -8,10 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compile\Base;
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Print Expression Class
diff --git a/src/Compile/PrivateRegisteredFunction.php b/src/Compile/Tag/PrivateRegisteredFunction.php
similarity index 98%
rename from src/Compile/PrivateRegisteredFunction.php
rename to src/Compile/Tag/PrivateRegisteredFunction.php
index de7567a6..a926bd32 100644
--- a/src/Compile/PrivateRegisteredFunction.php
+++ b/src/Compile/Tag/PrivateRegisteredFunction.php
@@ -8,7 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
+namespace Smarty\Compile\Tag;
 
 use Smarty\Compiler\Template;
 use Smarty\Smarty;
diff --git a/src/Compile/PrivateSpecialVariable.php b/src/Compile/Tag/PrivateSpecialVariable.php
similarity index 95%
rename from src/Compile/PrivateSpecialVariable.php
rename to src/Compile/Tag/PrivateSpecialVariable.php
index ef825f35..b8b4e028 100644
--- a/src/Compile/PrivateSpecialVariable.php
+++ b/src/Compile/Tag/PrivateSpecialVariable.php
@@ -8,13 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compile\Capture;
-use Smarty\Compile\Base;
-use Smarty\Compile\ForeachTag;
-use Smarty\Compile\Section;
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile special Smarty Variable Class
diff --git a/src/Compile/Rdelim.php b/src/Compile/Tag/Rdelim.php
similarity index 93%
rename from src/Compile/Rdelim.php
rename to src/Compile/Tag/Rdelim.php
index a7a899e4..e174a8a4 100644
--- a/src/Compile/Rdelim.php
+++ b/src/Compile/Tag/Rdelim.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Rdelim Class
diff --git a/src/Compile/Section.php b/src/Compile/Tag/Section.php
similarity index 99%
rename from src/Compile/Section.php
rename to src/Compile/Tag/Section.php
index ed815b9b..9eec84ab 100644
--- a/src/Compile/Section.php
+++ b/src/Compile/Tag/Section.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Section Class
diff --git a/src/Compile/SectionClose.php b/src/Compile/Tag/SectionClose.php
similarity index 90%
rename from src/Compile/SectionClose.php
rename to src/Compile/Tag/SectionClose.php
index 080cc2b2..ebaa6877 100644
--- a/src/Compile/SectionClose.php
+++ b/src/Compile/Tag/SectionClose.php
@@ -8,11 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compile\ForeachSection;
-use Smarty\Compile\Base;
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Sectionclose Class
diff --git a/src/Compile/SectionElse.php b/src/Compile/Tag/SectionElse.php
similarity index 93%
rename from src/Compile/SectionElse.php
rename to src/Compile/Tag/SectionElse.php
index f96f537b..a2c8242d 100644
--- a/src/Compile/SectionElse.php
+++ b/src/Compile/Tag/SectionElse.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Sectionelse Class
diff --git a/src/Compile/Setfilter.php b/src/Compile/Tag/Setfilter.php
similarity index 92%
rename from src/Compile/Setfilter.php
rename to src/Compile/Tag/Setfilter.php
index 352d77ee..2564d537 100644
--- a/src/Compile/Setfilter.php
+++ b/src/Compile/Tag/Setfilter.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Setfilter Class
diff --git a/src/Compile/SetfilterClose.php b/src/Compile/Tag/SetfilterClose.php
similarity index 95%
rename from src/Compile/SetfilterClose.php
rename to src/Compile/Tag/SetfilterClose.php
index 0aa01d42..a3c22652 100644
--- a/src/Compile/SetfilterClose.php
+++ b/src/Compile/Tag/SetfilterClose.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Setfilterclose Class
diff --git a/src/Compile/WhileClose.php b/src/Compile/Tag/WhileClose.php
similarity index 93%
rename from src/Compile/WhileClose.php
rename to src/Compile/Tag/WhileClose.php
index cec9e358..6b65f247 100644
--- a/src/Compile/WhileClose.php
+++ b/src/Compile/Tag/WhileClose.php
@@ -8,9 +8,7 @@
  * @author     Uwe Tews
  */
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile Whileclose Class
diff --git a/src/Compile/WhileTag.php b/src/Compile/Tag/WhileTag.php
similarity index 97%
rename from src/Compile/WhileTag.php
rename to src/Compile/Tag/WhileTag.php
index b6c44dd2..35f3d8a3 100644
--- a/src/Compile/WhileTag.php
+++ b/src/Compile/Tag/WhileTag.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Smarty\Compile;
-
-use Smarty\Compiler\Template;
+namespace Smarty\Compile\Tag;
 
 /**
  * Smarty Internal Plugin Compile While Class
diff --git a/src/Compiler/CodeFrame.php b/src/Compiler/CodeFrame.php
index 7cd5cdd3..9d4cb1eb 100644
--- a/src/Compiler/CodeFrame.php
+++ b/src/Compiler/CodeFrame.php
@@ -40,7 +40,7 @@ class CodeFrame
         \Smarty\Compiler\Template $compiler = null
     ) {
         // build property code
-        $properties[ 'version' ] = \Smarty::SMARTY_VERSION;
+        $properties[ 'version' ] = \Smarty\Smarty::SMARTY_VERSION;
         $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
         if (!$cache) {
             $properties[ 'has_nocache_code' ] = $this->_template->compiled->has_nocache_code;
diff --git a/src/Compiler/ConfigFile.php b/src/Compiler/Configfile.php
similarity index 97%
rename from src/Compiler/ConfigFile.php
rename to src/Compiler/Configfile.php
index 5be42649..0ede6a86 100644
--- a/src/Compiler/ConfigFile.php
+++ b/src/Compiler/Configfile.php
@@ -10,9 +10,9 @@
  */
 
 namespace Smarty\Compiler;
-use Smarty;
-use Smarty\Lexer\ConfigFileLexer;
-use Smarty\Parser\ConfigFileParser;
+use Smarty\Smarty;
+use Smarty\Lexer\ConfigfileLexer;
+use Smarty\Parser\ConfigfileParser;
 use Smarty\Template;
 use Smarty\CompilerException;
 
@@ -22,7 +22,7 @@ use Smarty\CompilerException;
  * @package    Smarty
  * @subpackage Config
  */
-class ConfigFile {
+class Configfile {
 
 	/**
 	 * Lexer class name
diff --git a/src/Compiler/Template.php b/src/Compiler/Template.php
index 3c507c30..56b21cd2 100644
--- a/src/Compiler/Template.php
+++ b/src/Compiler/Template.php
@@ -10,9 +10,9 @@
 
 namespace Smarty\Compiler;
 
-use Smarty;
-use Smarty\Compile\Base;
-use Smarty\Compile\ExtendsTag;
+use Smarty\Smarty;
+use Smarty\Compile\Tag\Base;
+use Smarty\Compile\Tag\ExtendsTag;
 use Smarty\Parser\TemplateParser;
 use Smarty\CompilerException;
 use Smarty\Exception;
@@ -521,6 +521,12 @@ class Template {
 		return $result;
 	}
 
+	public function compileModifier($modifier, $args) {
+		if ($modifierCompiler = $this->getModifierCompiler($modifier)) {
+			return $modifierCompiler->compile($args, $this);
+		}
+	}
+
 	/**
 	 * compile variable
 	 *
@@ -719,7 +725,7 @@ class Template {
 	 *
 	 * @param string $tag tag name
 	 *
-	 * @return bool|Base tag compiler object or false if not found or untrusted by security policy
+	 * @return bool|\Smarty\Compile\Tag\Base tag compiler object or false if not found or untrusted by security policy
 	 */
 	public function getTagCompiler($tag) {
 
@@ -727,109 +733,32 @@ class Template {
 			return false;
 		}
 
-		switch ($tag) {
-			case 'append':
-				return new \Smarty\Compile\Append();
-			case 'assign':
-				return new \Smarty\Compile\Assign();
-			case 'block':
-				return new \Smarty\Compile\Block();
-			case 'blockclose':
-				return new \Smarty\Compile\BlockClose();
-			case 'break':
-				return new \Smarty\Compile\BreakTag();
-			case 'call':
-				return new \Smarty\Compile\Call();
-			case 'capture':
-				return new \Smarty\Compile\Capture();
-			case 'captureclose':
-				return new \Smarty\Compile\CaptureClose();
-			case 'child':
-				return new \Smarty\Compile\Child();
-			case 'block_child':
-				return new \Smarty\Compile\BlockChild();
-			case 'block_parent':
-				return new \Smarty\Compile\BlockParent();
-			case 'config_load':
-				return new \Smarty\Compile\ConfigLoad();
-			case 'continue':
-				return new \Smarty\Compile\ContinueTag();
-			case 'debug':
-				return new \Smarty\Compile\Debug();
-			case 'eval':
-				return new \Smarty\Compile\EvalTag();
-			case 'extends':
-				return new \Smarty\Compile\ExtendsTag();
-			case 'for':
-				return new \Smarty\Compile\ForTag();
-			case 'foreach':
-				return new \Smarty\Compile\ForeachTag();
-			case 'foreachelse':
-				return new \Smarty\Compile\ForeachElse();
-			case 'foreachclose':
-				return new \Smarty\Compile\ForeachClose();
-			case 'forelse':
-				return new \Smarty\Compile\ForElse();
-			case 'forclose':
-				return new \Smarty\Compile\ForClose();
-			case 'function':
-				return new \Smarty\Compile\FunctionTag();
-			case 'functionclose':
-				return new \Smarty\Compile\FunctionClose();
-			case 'if':
-				return new \Smarty\Compile\IfTag();
-			case 'else':
-				return new \Smarty\Compile\ElseTag();
-			case 'elseif':
-				return new \Smarty\Compile\ElseIfTag();
-			case 'ifclose':
-				return new \Smarty\Compile\IfClose();
-			case 'include':
-				return new \Smarty\Compile\IncludeTag();
-			case 'insert':
-				return new \Smarty\Compile\Inser();
-			case 'ldelim':
-				return new \Smarty\Compile\Ldelim();
-			case 'rdelim':
-				return new \Smarty\Compile\Rdelim();
-			case 'make_nocache':
-				return new \Smarty\Compile\MakeNocache();
-			case 'nocache':
-				return new \Smarty\Compile\Nocache();
-			case 'nocacheclose':
-				return new \Smarty\Compile\NocacheClose();
-			case 'parent':
-				return new \Smarty\Compile\ParentTag();
-			case 'private_block_plugin':
-				return new \Smarty\Compile\PrivateBlockPlugin();
-			case 'private_function_plugin':
-				return new \Smarty\Compile\PrivateFunctionPlugin();
-			case 'private_modifier':
-				return new \Smarty\Compile\PrivateModifier();
-			case 'private_object_function':
-				return new \Smarty\Compile\PrivateObjectFunction();
-			case 'private_object_block_function':
-				return new \Smarty\Compile\PrivateObjectBlockFunction();
-			case 'private_print_expression':
-				return new \Smarty\Compile\PrivatePrintExpression();
-			case 'private_registered_function':
-				return new \Smarty\Compile\PrivateRegisteredFunction();
-			case 'private_special_variable':
-				return new \Smarty\Compile\PrivateSpecialVariable();
-			case 'section':
-				return new \Smarty\Compile\Section();
-			case 'sectionelse':
-				return new \Smarty\Compile\SectionElse();
-			case 'sectionclose':
-				return new \Smarty\Compile\SectionClose();
-			case 'setfilter':
-				return new \Smarty\Compile\Setfilter();
-			case 'setfilterclose':
-				return new \Smarty\Compile\SetfilterClose();
-			case 'while':
-				return new \Smarty\Compile\WhileTag();
-			case 'whileclose':
-				return new \Smarty\Compile\WhileClose();
+		foreach ($this->smarty->getExtensions() as $extension) {
+			if ($tag = $extension->getTagCompiler($tag)) {
+				return $tag;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * lazy loads internal compile plugin for modifier compile objects cached for reuse.
+	 *
+	 * @param string $modifier tag name
+	 *
+	 * @return bool|\Smarty\Compile\Modifier\Base tag compiler object or false if not found or untrusted by security policy
+	 */
+	public function getModifierCompiler($modifier) {
+
+		if (isset($this->smarty->security_policy) && !$this->smarty->security_policy->isTrustedModifier($modifier, $this)) {
+			return false;
+		}
+
+		foreach ($this->smarty->getExtensions() as $extension) {
+			if ($modifierCompiler = $extension->getModifierCompiler($modifier)) {
+				return $modifierCompiler;
+			}
 		}
 
 		return false;
diff --git a/src/Data.php b/src/Data.php
index 77c31fac..6f7c1137 100644
--- a/src/Data.php
+++ b/src/Data.php
@@ -439,7 +439,7 @@ abstract class Data
 	 */
 	public function configLoad($config_file, $sections = null)
 	{
-		$this->_loadConfigFile($this, $config_file, $sections, null);
+		$this->_loadConfigfile($this, $config_file, $sections, null);
 		return $this;
 	}
 
@@ -457,7 +457,7 @@ abstract class Data
 	 *
 	 * @api  Smarty::configLoad()
 	 */
-	public function _loadConfigFile($config_file, $sections = null, $scope = 0)
+	public function _loadConfigfile($config_file, $sections = null, $scope = 0)
 	{
 		/* @var \Smarty $smarty */
 		$smarty = $this->_getSmartyObj();
diff --git a/src/Extension/Base.php b/src/Extension/Base.php
new file mode 100644
index 00000000..caaa44bd
--- /dev/null
+++ b/src/Extension/Base.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Smarty\Extension;
+
+class Base implements ExtensionInterface {
+
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\Tag\Base {
+		return null;
+	}
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\Base {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/src/Extension/Core.php b/src/Extension/Core.php
new file mode 100644
index 00000000..3ef5b4c2
--- /dev/null
+++ b/src/Extension/Core.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Smarty\Extension;
+
+class Core extends Base {
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\Tag\Base {
+		switch ($tag) {
+			case 'append': return new \Smarty\Compile\Tag\Append();
+			case 'assign': return new \Smarty\Compile\Tag\Assign();
+			case 'block': return new \Smarty\Compile\Tag\Block();
+			case 'blockclose': return new \Smarty\Compile\Tag\BlockClose();
+			case 'break': return new \Smarty\Compile\Tag\BreakTag();
+			case 'call': return new \Smarty\Compile\Tag\Call();
+			case 'capture': return new \Smarty\Compile\Tag\Capture();
+			case 'captureclose': return new \Smarty\Compile\Tag\CaptureClose();
+			case 'child': return new \Smarty\Compile\Tag\Child();
+			case 'block_child': return new \Smarty\Compile\Tag\BlockChild();
+			case 'block_parent': return new \Smarty\Compile\Tag\BlockParent();
+			case 'config_load': return new \Smarty\Compile\Tag\ConfigLoad();
+			case 'continue': return new \Smarty\Compile\Tag\ContinueTag();
+			case 'debug': return new \Smarty\Compile\Tag\Debug();
+			case 'eval': return new \Smarty\Compile\Tag\EvalTag();
+			case 'extends': return new \Smarty\Compile\Tag\ExtendsTag();
+			case 'for': return new \Smarty\Compile\Tag\ForTag();
+			case 'foreach': return new \Smarty\Compile\Tag\ForeachTag();
+			case 'foreachelse': return new \Smarty\Compile\Tag\ForeachElse();
+			case 'foreachclose': return new \Smarty\Compile\Tag\ForeachClose();
+			case 'forelse': return new \Smarty\Compile\Tag\ForElse();
+			case 'forclose': return new \Smarty\Compile\Tag\ForClose();
+			case 'function': return new \Smarty\Compile\Tag\FunctionTag();
+			case 'functionclose': return new \Smarty\Compile\Tag\FunctionClose();
+			case 'if': return new \Smarty\Compile\Tag\IfTag();
+			case 'else': return new \Smarty\Compile\Tag\ElseTag();
+			case 'elseif': return new \Smarty\Compile\Tag\ElseIfTag();
+			case 'ifclose': return new \Smarty\Compile\Tag\IfClose();
+			case 'include': return new \Smarty\Compile\Tag\IncludeTag();
+			case 'insert': return new \Smarty\Compile\Inser();
+			case 'ldelim': return new \Smarty\Compile\Tag\Ldelim();
+			case 'rdelim': return new \Smarty\Compile\Tag\Rdelim();
+			case 'make_nocache': return new \Smarty\Compile\Tag\MakeNocache();
+			case 'nocache': return new \Smarty\Compile\Tag\Nocache();
+			case 'nocacheclose': return new \Smarty\Compile\Tag\NocacheClose();
+			case 'parent': return new \Smarty\Compile\Tag\ParentTag();
+			case 'private_block_plugin': return new \Smarty\Compile\Tag\PrivateBlockPlugin();
+			case 'private_function_plugin': return new \Smarty\Compile\Tag\PrivateFunctionPlugin();
+			case 'private_modifier': return new \Smarty\Compile\Tag\PrivateModifier();
+			case 'private_object_function': return new \Smarty\Compile\Tag\PrivateObjectFunction();
+			case 'private_object_block_function': return new \Smarty\Compile\Tag\PrivateObjectBlockFunction();
+			case 'private_print_expression': return new \Smarty\Compile\Tag\PrivatePrintExpression();
+			case 'private_registered_function': return new \Smarty\Compile\Tag\PrivateRegisteredFunction();
+			case 'private_special_variable': return new \Smarty\Compile\Tag\PrivateSpecialVariable();
+			case 'section': return new \Smarty\Compile\Tag\Section();
+			case 'sectionelse': return new \Smarty\Compile\Tag\SectionElse();
+			case 'sectionclose': return new \Smarty\Compile\Tag\SectionClose();
+			case 'setfilter': return new \Smarty\Compile\Tag\Setfilter();
+			case 'setfilterclose': return new \Smarty\Compile\Tag\SetfilterClose();
+			case 'while': return new \Smarty\Compile\Tag\WhileTag();
+			case 'whileclose': return new \Smarty\Compile\Tag\WhileClose();
+		}
+		return null;
+	}
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\Base {
+		switch ($modifier) {
+			case 'cat': return new \Smarty\Compile\Modifier\CatModifierCompiler();
+			case 'count_characters': return new \Smarty\Compile\Modifier\CountCharactersModifierCompiler();
+			case 'count_paragraphs': return new \Smarty\Compile\Modifier\CountParagraphsModifierCompiler();
+			case 'count_sentences': return new \Smarty\Compile\Modifier\CountSentencesModifierCompiler();
+			case 'count_words': return new \Smarty\Compile\Modifier\CountWordsModifierCompiler();
+			case 'default': return new \Smarty\Compile\DefaultModifierCompiler();
+			case 'escape': return new \Smarty\Compile\Modifier\EscapeModifierCompiler();
+			case 'from_charset': return new \Smarty\Compile\Modifier\FromCharsetModifierCompiler();
+			case 'indent': return new \Smarty\Compile\Modifier\IndentModifierCompiler();
+			case 'lower': return new \Smarty\Compile\Modifier\LowerModifierCompiler();
+			case 'nl2br': return new \Smarty\Compile\Modifier\Nl2brModifierCompiler();
+			case 'noprint': return new \Smarty\Compile\Modifier\NoPrintModifierCompiler();
+			case 'round': return new \Smarty\Compile\Modifier\RoundModifierCompiler();
+			case 'str_repeat': return new \Smarty\Compile\Modifier\StrRepeatModifierCompiler();
+			case 'string_format': return new \Smarty\Compile\Modifier\StringFormatModifierCompiler();
+			case 'strip': return new \Smarty\Compile\Modifier\StripModifierCompiler();
+			case 'strip_tags': return new \Smarty\Compile\Modifier\StripTagsModifierCompiler();
+			case 'strlen': return new \Smarty\Compile\Modifier\StrlenModifierCompiler();
+			case 'to_charset': return new \Smarty\Compile\Modifier\ToCharsetModifierCompiler();
+			case 'unescape': return new \Smarty\Compile\Modifier\UnescapeModifierCompiler();
+			case 'upper': return new \Smarty\Compile\Modifier\UpperModifierCompiler();
+			case 'wordwrap': return new \Smarty\Compile\Modifier\WordWrapModifierCompiler();
+		}
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/src/Extension/ExtensionInterface.php b/src/Extension/ExtensionInterface.php
new file mode 100644
index 00000000..018f058c
--- /dev/null
+++ b/src/Extension/ExtensionInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Smarty\Extension;
+
+interface ExtensionInterface {
+
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\Tag\Base;
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\Base;
+
+}
\ No newline at end of file
diff --git a/src/Lexer/ConfigfileLexer.plex b/src/Lexer/ConfigfileLexer.plex
index 31ba0413..a895050c 100644
--- a/src/Lexer/ConfigfileLexer.plex
+++ b/src/Lexer/ConfigfileLexer.plex
@@ -3,7 +3,7 @@
 namespace Smarty\Lexer;
 
 /**
-* Smarty Internal Plugin Configfilelexer
+* Smarty Internal Plugin ConfigfileLexer
 *
 * This is the lexer to break the config file source into tokens 
 * @package Smarty
@@ -11,7 +11,7 @@ namespace Smarty\Lexer;
 * @author Uwe Tews 
 */
 /**
-* Configfilelexer
+* ConfigfileLexer
 *
 * This is the config file lexer.
 * It is generated from the ConfigfileLexer.plex file
@@ -20,7 +20,7 @@ namespace Smarty\Lexer;
 * @subpackage Compiler
 * @author Uwe Tews
 */
-class Configfilelexer
+class ConfigfileLexer
 {
     /**
      * Source
@@ -73,7 +73,7 @@ class Configfilelexer
     /**
      * compiler object
      *
-     * @var \Smarty\Compiler\ConfigFile
+     * @var \Smarty\Compiler\Configfile
      */
     private $compiler = null;
     /**
@@ -125,9 +125,9 @@ class Configfilelexer
      * constructor
      *
      * @param   string                             $data template source
-     * @param \Smarty\Compiler\ConfigFile $compiler
+     * @param \Smarty\Compiler\Configfile $compiler
      */
-    public function __construct($data, \Smarty\Compiler\ConfigFile $compiler)
+    public function __construct($data, \Smarty\Compiler\Configfile $compiler)
     {
         $this->data = $data . "\n"; //now all lines are \n-terminated
         $this->dataLength = strlen($data);
diff --git a/src/Parser/ConfigfileParser.y b/src/Parser/ConfigfileParser.y
index 23ad6d2f..2f031323 100644
--- a/src/Parser/ConfigfileParser.y
+++ b/src/Parser/ConfigfileParser.y
@@ -1,8 +1,3 @@
-
-namespace Smarty\Parser;
-
-use \Smarty\Lexer\Configfile as Lexer;
-
 /**
 * ConfigfileParser
 *
@@ -15,6 +10,12 @@ use \Smarty\Lexer\Configfile as Lexer;
 */
 %name TPC_
 %declare_class {
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\Configfile as Lexer;
+use \Smarty\Compiler\Configfile as Configfile;
+
 /**
 * Smarty Internal Plugin Configfileparse
 *
@@ -59,7 +60,7 @@ class ConfigfileParser
     /**
      * compiler object
      *
-     * @var \Smarty\Compiler\ConfigFile
+     * @var Configfile
      */
     public $compiler = null;
     /**
@@ -92,9 +93,9 @@ class ConfigfileParser
      * constructor
      *
      * @param Lexer      $lex
-     * @param \Smarty\Compiler\ConfigFile $compiler
+     * @param Configfile $compiler
      */
-    public function __construct(Lexer $lex, \Smarty\Compiler\ConfigFile $compiler)
+    public function __construct(Lexer $lex, Configfile $compiler)
     {
         $this->lex = $lex;
         $this->smarty = $compiler->smarty;
@@ -242,8 +243,8 @@ class ConfigfileParser
 
 %stack_overflow
 {
-    $this->internalError = true;
-    $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
 }
 
 // Complete config file
diff --git a/src/Parser/TemplateParser.y b/src/Parser/TemplateParser.y
index 628d14a7..7508e8fb 100644
--- a/src/Parser/TemplateParser.y
+++ b/src/Parser/TemplateParser.y
@@ -1,8 +1,3 @@
-
-namespace Smarty\Parser;
-
-use \Smarty\Lexer\Configfile as Lexer;
-
 /*
  * This file is part of Smarty.
  *
@@ -14,6 +9,18 @@ use \Smarty\Lexer\Configfile as Lexer;
 %stack_size 500
 %name TP_
 %declare_class {
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\TemplateLexer as Lexer;
+use \Smarty\ParseTree\Template as TemplateParseTree;
+use \Smarty\Compiler\Template as TemplateCompiler;
+use \Smarty\ParseTree\Code;
+use \Smarty\ParseTree\Dq;
+use \Smarty\ParseTree\DqContent;
+use \Smarty\ParseTree\Tag;
+
+
 /**
 * Smarty Template Parser Class
 *
@@ -65,7 +72,7 @@ class TemplateParser
     /**
      * root parse tree buffer
      *
-     * @var \Smarty\ParseTree\Template
+     * @var TemplateParseTree
      */
     public $root_buffer;
 
@@ -99,7 +106,7 @@ class TemplateParser
     /**
      * compiler object
      *
-     * @var \Smarty\Compiler\Template
+     * @var TemplateCompiler
      */
     public $compiler = null;
 
@@ -149,16 +156,16 @@ class TemplateParser
      * constructor
      *
      * @param Lexer        $lex
-     * @param \Smarty\Compiler\Template $compiler
+     * @param TemplateCompiler $compiler
      */
-    public function __construct(Lexer $lex, \Smarty\Compiler\Template $compiler)
+    public function __construct(Lexer $lex, TemplateCompiler $compiler)
     {
         $this->lex = $lex;
         $this->compiler = $compiler;
         $this->template = $this->compiler->template;
         $this->smarty = $this->template->smarty;
-        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
-        $this->current_buffer = $this->root_buffer = new \Smarty\ParseTree\Template();
+        $this->security = $this->smarty->security_policy ?? false;
+        $this->current_buffer = $this->root_buffer = new TemplateParseTree();
     }
 
      /**
@@ -168,7 +175,7 @@ class TemplateParser
      */
     public function insertPhpCode($code)
     {
-        $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Tag($this, $code));
+        $this->current_buffer->append_subtree($this, new Tag($this, $code));
     }
 
     /**
@@ -190,7 +197,7 @@ class TemplateParser
      *
      * @param string $code
      *
-     * @return \Smarty\ParseTree\Tag
+     * @return Tag
      */
     public function mergePrefixCode($code)
     {
@@ -200,7 +207,7 @@ class TemplateParser
         }
         $this->compiler->prefix_code = array();
         $tmp .= $code;
-        return new \Smarty\ParseTree\Tag($this, $this->compiler->processNocacheCode($tmp, true));
+        return new Tag($this, $this->compiler->processNocacheCode($tmp, true));
     }
 
 }
@@ -1241,34 +1248,34 @@ doublequoted(res)          ::= doublequoted(o1) doublequotedcontent(o2). {
 }
 
 doublequoted(res)          ::= doublequotedcontent(o). {
-    res = new \Smarty\ParseTree\Dq($this, o);
+    res = new Dq($this, o);
 }
 
 doublequotedcontent(res)           ::=  BACKTICK variable(v) BACKTICK. {
-    res = new \Smarty\ParseTree\Code('(string)'.v);
+    res = new Code('(string)'.v);
 }
 
 doublequotedcontent(res)           ::=  BACKTICK expr(e) BACKTICK. {
-    res = new \Smarty\ParseTree\Code('(string)('.e.')');
+    res = new Code('(string)('.e.')');
 }
 
 doublequotedcontent(res)           ::=  DOLLARID(i). {
-    res = new \Smarty\ParseTree\Code('(string)$_smarty_tpl->tpl_vars[\''. substr(i,1) .'\']->value');
+    res = new Code('(string)$_smarty_tpl->tpl_vars[\''. substr(i,1) .'\']->value');
 }
 
 doublequotedcontent(res)           ::=  LDEL variable(v) RDEL. {
-    res = new \Smarty\ParseTree\Code('(string)'.v);
+    res = new Code('(string)'.v);
 }
 
 doublequotedcontent(res)           ::=  LDEL expr(e) RDEL. {
-    res = new \Smarty\ParseTree\Code('(string)('.e.')');
+    res = new Code('(string)('.e.')');
 }
 
 doublequotedcontent(res)     ::=  smartytag(st). {
-    res = new \Smarty\ParseTree\Tag($this, st);
+    res = new Tag($this, st);
 }
 
 doublequotedcontent(res)           ::=  TEXT(o). {
-    res = new \Smarty\ParseTree\DqContent(o);
+    res = new DqContent(o);
 }
 
diff --git a/src/Resource/BasePlugin.php b/src/Resource/BasePlugin.php
index c787ee8a..6738c96b 100644
--- a/src/Resource/BasePlugin.php
+++ b/src/Resource/BasePlugin.php
@@ -2,6 +2,8 @@
 
 namespace Smarty\Resource;
 
+use Smarty\Smarty;
+
 /**
  * Smarty Resource Plugin
  *
@@ -28,14 +30,14 @@ abstract class BasePlugin
      *
      * @var array
      */
-    public static $sysplugins = array(
-        'file'    => File::class,
-        'string'  => String::class,
+    public static $sysplugins = [
+        'file'    => FilePlugin::class,
+        'string'  => StringPlugin::class,
         'extends' => ExtendsPlugin::class,
-        'stream'  => Stream::class,
+        'stream'  => StreamPlugin::class,
         'eval'    => StringEval::class,
-        'php'     => Php::class,
-    );
+        'php'     => PhpPlugin::class,
+    ];
 
     /**
      * Source is bypassing compiler
@@ -67,7 +69,7 @@ abstract class BasePlugin
      * @return BasePlugin Resource Handler
      *@throws \Smarty\Exception
      */
-    public static function load(\Smarty $smarty, $type)
+    public static function load(Smarty $smarty, $type)
     {
         // try smarty's cache
         if (isset($smarty->_resource_handlers[ $type ])) {
@@ -79,7 +81,7 @@ abstract class BasePlugin
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
-            $_resource_class = 'Smarty_Internal_Resource_' . \smarty_ucfirst_ascii($type);
+            $_resource_class = self::$sysplugins[ $type ];
             return $smarty->_resource_handlers[ $type ] = new $_resource_class();
         }
         // try plugins dir
@@ -212,13 +214,13 @@ abstract class BasePlugin
     /**
      * modify resource_name according to resource handlers specifications
      *
-     * @param \Smarty  $smarty        Smarty instance
+     * @param Smarty  $smarty        Smarty instance
      * @param string  $resource_name resource_name to make unique
      * @param boolean $isConfig      flag for config resource
      *
      * @return string unique resource name
      */
-    public function buildUniqueResourceName(\Smarty $smarty, $resource_name, $isConfig = false)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
         if ($isConfig) {
             if (!isset($smarty->_joined_config_dir)) {
diff --git a/src/Resource/CustomPlugin.php b/src/Resource/CustomPlugin.php
index 2d62dd98..e0b32756 100644
--- a/src/Resource/CustomPlugin.php
+++ b/src/Resource/CustomPlugin.php
@@ -8,7 +8,7 @@
  */
 
 namespace Smarty\Resource;
-use Smarty;
+use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Source;
 use Smarty\Exception;
diff --git a/src/Resource/FilePlugin.php b/src/Resource/FilePlugin.php
index bd6c957f..e9732427 100644
--- a/src/Resource/FilePlugin.php
+++ b/src/Resource/FilePlugin.php
@@ -9,7 +9,7 @@
  */
 
 namespace Smarty\Resource;
-use Smarty;
+use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Source;
 use Smarty\Exception;
diff --git a/src/Resource/RecompiledPlugin.php b/src/Resource/RecompiledPlugin.php
index 1616ff91..19b8a389 100644
--- a/src/Resource/RecompiledPlugin.php
+++ b/src/Resource/RecompiledPlugin.php
@@ -9,7 +9,7 @@
 
 namespace Smarty\Resource;
 
-use Smarty;
+use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Compiled;
 
diff --git a/src/Resource/StreamPlugin.php b/src/Resource/StreamPlugin.php
index b3058b58..3173b545 100644
--- a/src/Resource/StreamPlugin.php
+++ b/src/Resource/StreamPlugin.php
@@ -11,7 +11,7 @@
 
 namespace Smarty\Resource;
 
-use Smarty;
+use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Source;
 
diff --git a/src/Resource/StringEval.php b/src/Resource/StringEval.php
index 0ac9f8b6..157c991e 100644
--- a/src/Resource/StringEval.php
+++ b/src/Resource/StringEval.php
@@ -2,6 +2,8 @@
 
 namespace Smarty\Resource;
 
+use Smarty\Smarty;
+
 /**
  * Smarty Internal Plugin Resource Eval
  *
@@ -19,7 +21,7 @@ namespace Smarty\Resource;
  * @package    Smarty
  * @subpackage TemplateResources
  */
-class StringEval extends Recompiled
+class StringEval extends RecompiledPlugin
 {
     /**
      * populate Source Object with meta data from Resource
@@ -72,13 +74,13 @@ class StringEval extends Recompiled
     /**
      * modify resource_name according to resource handlers specifications
      *
-     * @param \Smarty  $smarty        Smarty instance
+     * @param Smarty  $smarty        Smarty instance
      * @param string  $resource_name resource_name to make unique
      * @param boolean $isConfig      flag for config resource
      *
      * @return string unique resource name
      */
-    public function buildUniqueResourceName(\Smarty $smarty, $resource_name, $isConfig = false)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
         return get_class($this) . '#' . $this->decode($resource_name);
     }
diff --git a/src/Resource/StringPlugin.php b/src/Resource/StringPlugin.php
index 9dde2f24..c8f442e1 100644
--- a/src/Resource/StringPlugin.php
+++ b/src/Resource/StringPlugin.php
@@ -9,7 +9,7 @@
  */
 
 namespace Smarty\Resource;
-use Smarty;
+use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Source;
 
diff --git a/src/Resource/UncompiledPlugin.php b/src/Resource/UncompiledPlugin.php
index a70f4784..2793d694 100644
--- a/src/Resource/UncompiledPlugin.php
+++ b/src/Resource/UncompiledPlugin.php
@@ -9,7 +9,7 @@
 
 namespace Smarty\Resource;
 
-use Smarty;
+use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Compiled;
 
diff --git a/src/Smarty.php b/src/Smarty.php
index d624334c..00000539 100644
--- a/src/Smarty.php
+++ b/src/Smarty.php
@@ -2,6 +2,9 @@
 
 namespace Smarty;
 
+use Smarty\Extension\Base;
+use Smarty\Extension\Core;
+use Smarty\Extension\ExtensionInterface;
 use Smarty\Smarty\Runtime\CaptureRuntime;
 use Smarty\Smarty\Runtime\ForeachRuntime;
 use Smarty\Smarty\Runtime\InheritanceRuntime;
@@ -564,6 +567,12 @@ class Smarty extends \Smarty\TemplateBase
 	 */
 	public $_cacheresource_handlers = [];
 
+	/**
+	 * List of extensions
+	 * @var ExtensionInterface[]
+	 */
+	private $extensions = [];
+
     /**
      * Initialize new Smarty object
      */
@@ -584,8 +593,32 @@ class Smarty extends \Smarty\TemplateBase
         if (\Smarty\Smarty::$_CHARSET !== 'UTF-8') {
             \Smarty\Smarty::$_UTF8_MODIFIER = '';
         }
+
+		$this->extensions[] = new Core();
     }
 
+	/**
+	 * Load an additional extension.
+	 *
+	 * @param Base $extension
+	 *
+	 * @return void
+	 */
+	public function addExtension(ExtensionInterface $extension) {
+		$this->extensions[] = $extension;
+	}
+
+	/**
+	 * Returns all loaded extensions
+	 *
+	 * @return array|ExtensionInterface[]
+	 */
+	public function getExtensions(): array {
+		return $this->extensions;
+	}
+
+
+
     /**
      * Check if a template resource exists
      *
@@ -766,7 +799,25 @@ class Smarty extends \Smarty\TemplateBase
         return $this;
     }
 
-    /**
+	/**
+	 * Get plugin directories
+	 *
+	 * @return array list of plugin directories
+	 */
+	public function getPluginsDir()
+	{
+		if (!$this->_pluginsDirNormalized) {
+			foreach ($this->plugins_dir as $k => $v) {
+				$this->plugins_dir[ $k ] = $this->_realpath(rtrim($v ?? '', '/\\') . DIRECTORY_SEPARATOR, true);
+			}
+			$this->_cache[ 'plugin_files' ] = array();
+			$this->_pluginsDirNormalized = true;
+		}
+		return $this->plugins_dir;
+	}
+
+
+	/**
      * Set plugins directory
      *
      * @param string|array $plugins_dir directory(s) of plugins
@@ -1830,15 +1881,15 @@ class Smarty extends \Smarty\TemplateBase
 		// Lazy load runtimes when/if needed
 		switch ($type) {
 			case 'Capture':
-				return $this->runtimes[$type] = new Smarty\Runtime\CaptureRuntime();
+				return $this->runtimes[$type] = new \Smarty\Runtime\CaptureRuntime();
 			case 'Foreach':
-				return $this->runtimes[$type] = new Smarty\Runtime\ForeachRuntime();
+				return $this->runtimes[$type] = new \Smarty\Runtime\ForeachRuntime();
 			case 'Inheritance':
-				return $this->runtimes[$type] = new Smarty\Runtime\InheritanceRuntime();
+				return $this->runtimes[$type] = new \Smarty\Runtime\InheritanceRuntime();
 			case 'MakeNocache':
-				return $this->runtimes[$type] = new Smarty\Runtime\MakeNocacheRuntime();
+				return $this->runtimes[$type] = new \Smarty\Runtime\MakeNocacheRuntime();
 			case 'TplFunction':
-				return $this->runtimes[$type] = new Smarty\Runtime\TplFunctionRuntime();
+				return $this->runtimes[$type] = new \Smarty\Runtime\TplFunctionRuntime();
 		}
 
 		throw new \Smarty\Exception('Trying to load invalid runtime ' . $type);
diff --git a/src/Template.php b/src/Template.php
index 053c22f3..9b6309ac 100644
--- a/src/Template.php
+++ b/src/Template.php
@@ -167,7 +167,7 @@ class Template extends TemplateBase {
 			$smarty->security_policy->registerCallBacks($this);
 		}
 
-		$this->codeFrameCompiler = new Smarty\Compiler\CodeFrame($this);
+		$this->codeFrameCompiler = new \Smarty\Compiler\CodeFrame($this);
 	}
 
 	/**
diff --git a/src/Template/Config.php b/src/Template/Config.php
index 8ecd95a8..cf6d0c91 100644
--- a/src/Template/Config.php
+++ b/src/Template/Config.php
@@ -2,7 +2,7 @@
 
 namespace Smarty\Template;
 
-use Smarty;
+use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Exception;
 
@@ -40,7 +40,7 @@ class Config extends Source {
 	 *
 	 * @var string
 	 */
-	public $compiler_class = \Smarty\Compiler\ConfigFile::class;
+	public $compiler_class = \Smarty\Compiler\Configfile::class;
 
 	/**
 	 * Name of the Class to tokenize this resource's contents with
diff --git a/src/Template/Source.php b/src/Template/Source.php
index ffdba431..f5a6b0b9 100644
--- a/src/Template/Source.php
+++ b/src/Template/Source.php
@@ -2,7 +2,7 @@
 
 namespace Smarty\Template;
 
-use Smarty;
+use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Exception;
 
@@ -140,7 +140,7 @@ class Source {
 	 * @internal param \Smarty\Resource\Base $handler Resource Handler this source object communicates with
 	 */
 	public function __construct(Smarty $smarty, $resource, $type, $name) {
-		$this->handler = Smarty\Resource\BasePlugin::load($smarty, $type);
+		$this->handler = \Smarty\Resource\BasePlugin::load($smarty, $type);
 
 		$this->smarty = $smarty;
 		$this->resource = $resource;
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index eb9c76f7..51704c3b 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -8,7 +8,6 @@
  */
 require_once __DIR__ . '/Config.php';
 require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../libs/bootstrap.php';
 
 require_once 'PHPUnit_Smarty.php';
 if (!ini_get('date.timezone')) {
diff --git a/tests/UnitTests/A_1/ProtectedFolderVars/ProtectedFolderVarsTest.php b/tests/UnitTests/A_1/ProtectedFolderVars/ProtectedFolderVarsTest.php
index db8691f8..86c0e41e 100644
--- a/tests/UnitTests/A_1/ProtectedFolderVars/ProtectedFolderVarsTest.php
+++ b/tests/UnitTests/A_1/ProtectedFolderVars/ProtectedFolderVarsTest.php
@@ -211,7 +211,7 @@ class ProtectedFolderVarsTest extends PHPUnit_Smarty
     }
 }
 
-class FolderT extends Smarty
+class FolderT extends \Smarty\Smarty
 {
     protected $template_dir = './foo';
 
diff --git a/tests/UnitTests/ResourceTests/Custom/Ambiguous/PHPunitplugins/resource.ambiguous.php b/tests/UnitTests/ResourceTests/Custom/Ambiguous/PHPunitplugins/resource.ambiguous.php
index 89e80a40..8f6cec72 100644
--- a/tests/UnitTests/ResourceTests/Custom/Ambiguous/PHPunitplugins/resource.ambiguous.php
+++ b/tests/UnitTests/ResourceTests/Custom/Ambiguous/PHPunitplugins/resource.ambiguous.php
@@ -1,6 +1,7 @@
 <?php
 
 use Smarty\Resource\FilePlugin;
+use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Source;
 
diff --git a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.test.php b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.test.php
index b52a2eae..07cd9d40 100644
--- a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.test.php
+++ b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.test.php
@@ -1,7 +1,7 @@
 <?php
 
 // compiler.test.php
-use Smarty\Compile\Base;
+use Smarty\Compile\Tag\Base;
 
 class smarty_compiler_test extends Base
 {
diff --git a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.testclose.php b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.testclose.php
index cc64f8f0..32d8b377 100644
--- a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.testclose.php
+++ b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.testclose.php
@@ -1,7 +1,7 @@
 <?php
 
 // compiler.testclose.php
-use Smarty\Compile\Base;
+use Smarty\Compile\Tag\Base;
 
 class smarty_compiler_testclose extends Base
 {
diff --git a/tests/UnitTests/__shared/PHPunitplugins/compiler.getparamsshort.php b/tests/UnitTests/__shared/PHPunitplugins/compiler.getparamsshort.php
index 68804cf9..210ff6ac 100644
--- a/tests/UnitTests/__shared/PHPunitplugins/compiler.getparamsshort.php
+++ b/tests/UnitTests/__shared/PHPunitplugins/compiler.getparamsshort.php
@@ -6,7 +6,7 @@
  * @subpackage PHPunitPlugin
  */
 
-use Smarty\Compile\Base;
+use Smarty\Compile\Tag\Base;
 
 /**
  * Smarty {getparams}
diff --git a/utilities/make-lexer.php b/utilities/make-lexer.php
new file mode 100644
index 00000000..cfeeede4
--- /dev/null
+++ b/utilities/make-lexer.php
@@ -0,0 +1,7 @@
+<?php
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+$lex = new \SmartyGenerator\LexerGenerator();
+$lex->create($argv[1], $argv[2]);
+
diff --git a/utilities/make-parser.php b/utilities/make-parser.php
new file mode 100644
index 00000000..9e399edc
--- /dev/null
+++ b/utilities/make-parser.php
@@ -0,0 +1,11 @@
+<?php
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+$parser = new \SmartyGenerator\ParserGenerator();
+$parser->setQuiet();
+$parser->main($argv[1], $argv[2]);
+
+$content = file_get_contents($argv[2]);
+$content = preg_replace(array('#/\*\s*\d+\s*\*/#', "#'lhs'#", "#'rhs'#"), array('', 0, 1), $content);
+file_put_contents($argv[2], $content);