move to new directory structure