Moved mixins to separate inc_ file
structure change
small update