refactor to simplify hierarchy
clean up page_barfer and feature specs
refactor catalog, product, and their tests