Refactoring Synth to template class and addressing other review points
12 files changed