Rearrange paths and use constants to allow changing from defaults.