Renaming directories appropriately