refactor(models): improved code organization