Add mixin to sass in the config
file and made the files structure
better with proper format.
Fix merge issues.