Refactor module and remove duplicate html file