Add BlockTemplates
Rename classes