[master] close #1 +: renamed templates to modules after discussing about this