Add root directory swapping