Refactor all mixins to follow the seperatation convention