Minor
reorganize and update links