restructures twig files
restructures twig files