Dir names change, some misc changes