Closed as part of HSEARCH-3179 Open . I added function to the merging script to rewrite the history of the Search 6 proof-of-concept so that the modules will appear to have always been organized in the way described in this ticket.