Rebase of file structure finished and working