Replaced filenames and moved a mixin