Improved template engine
Large refactoring
Committed file that was accidentially unversioned