Removing redundant files. Renaming analytics mixin.