reflect new directory layout, WARNING: TEST IS BROKEN