Updating some mixins for better organization and updating include and extend references.