OK I spent quite a but of time last night dissecting MOAR, S&T and R&F and this is the conclusion I have come to. MOAR is working fine with R&F and looks like it will be a lot easier to keep WE compatible with MOAR than modify it for S&T. From the point of view of adding new units to Civ 6, MOAR and S&T are basically the same and the only unit that S&T has that MOAR with WE does not have is the Mortar. So I have decided I am going to leave WE compatible with MOAR and remove the WE Pike & Shot and the UAV units as well as fix the other upgrade path issues. This way it will be compatible with R&F as well as the base game and will take a lot less time than converting it to S&T. I will also make an add-on so people who do not own R&F can still have these units. And NO I will not be making a separate S&T version.