Working on folder refactoring.
Refactoring bookmarks.