sort out directory layout