Reorganize and update README