Cleaning up naming.
Added Twig to Mackstar/Spout package.