re-organizing directory layout