Create directory hierachy manually without makedirs(), as that fails due to mode issues
Cleanup the old hierachy after the merge