6 organize bookmarks

Closes #6