Refactor to avoid cycle between root package and first model package