refactored model packages