make Bookmark.groovy -> .txt
Merge branch 'fixjson'
un-change names of consumer.groovy files