Reorganized Twig and Smarty dependencies