Reorganize to match new name; README
README is rst