Adding mixin, filename and module variant guidelines, along wioth other
tweaks