Modified paths to reflect new directory structure.