Fixed Paths to reflect new directory structure