Re-factor code; drop individual template implementation in favor of generic template with Driver.dir file