[#69851230] More reorganization/cleanup for autotools