Bookmarks

Reorganizing bookmarks. Renaming some.