Update paths to reflect new convention