Bookmarks

code organization, porting and cleanups