changed namespaces again to match the original twig structure
centralized the syntax checking
fix