Module template fix
Module refactoring
Product Model