updated to new directory structure