more reshuffling of dir tree