Rebase directory structure