fixed paths to reflect new directory structure