Consolidate various dirs.