making the directory layout nicer for tests