Convert existing classes to templates