Changing directory paths - hopefully I didn't screw anything up too badly!