Rearranged bookmarks into class