Are modules being replaced with templates @nilan? Wondering for my project whether to slightly restructure it.

yes

Sweet

but it should be fairly easy to "flatten" a module into the base service definition