Moved mixins to the concerns directory
Fixed concerns