refactoring..BookmarkManager into app folder and ..