Renamed the Template class to be more consistent. Also added some basic refactoring and removed unwanted functionality.