Using a different directory scheme than originally discussed.