release 2, adapt some paths