Changed wrong filename, added private and public mixins conventions