Refactored bundle processing to push up complex logic, and pull down unique features to each scenario (namely, primary and forked repos)