Changed paths to be more consistent.