Moved new templates to the module
Further developments