Changes to file structure, tags and mixins