more product refactoring
12 files changed