refactor back to root folders