update to new directory structure