Refactor toward better root import