Refactoring toward better root import