updating to new directory structure