revise package structure
implement b2b comparison