renaming twig macro files to .html.twig
Combining all macros in one file