- Fixed a problem with scopes introduced by blocks and variable names.
- Changed generation so that a module instead of a class is generated for each template.