CMS-3074 Site Templates - Drop use of "module" folder inside the site template