Updated for new directory structure