6790 - Gruntify all the feedhenry-templates, both client and server: basic re-org