fix bibnotes organization; remove redundant structure