Remove dumplicate file
Add extend  in mixins