Update for new directory structure