adjust to new, more LSB-similar directory layout, and factor data dir into a variable to make it easier to manage