Restructure bookmark and marks plugins.