Twig restructure

For the time being this is one huge mess.