2nd pass
re-implement the required plugins better
Merge pull request #98 from presscodes/twig-restructure

Restructuring files & templates