Separating unit mixins into individual files
Correcting variable formatting
Correcting variable usage and updating tests
Pluralising 'units' folder name