Renamed definitions file and clarified code using it.
Worked towards using a unit dictionary.