change to reflect new directory structure