Cleanup - got rid of template class and put template file fetching in generator