bookmark functionality
reorg code and dirs for bookmark facility
reorganized structure a bit