Refactor root -> share