refactor Block module template names/locations
Merge pull request #2053 from craigh/blockTemplateRefactor

refactor Block module template names/locations