Added new mixins and restructured directory