Added basic bookmark and folder classes