Changed wrong filename, added private and public mixins conventions
Rename files for consistent naming convention