Refactor document roots again