[Code] Renamed BookmarksModel class to Bookmarks

It actually is not model. BookmarksModel name will be needed for future
Bookmarks DataModel class.
[Code] Various cleanups in Bookmarks code