Dir tree re-org