Update links and names in readme to reflect moves

If you change directory structure, you have to change links or 404's will happen in github.