Reorganize to match new name; README