[C] - moved model classes from default package