Shift to new directory structure