refactored package unit to units
refactored to differentiate datamodels and viewmodels