combined two unconditionally included files into the main module file
lots of refactoring of the upsell module file