Updated to reflect new paths