SDN run-time control solutions need to be more capable, modular, interoperable and robust. The ONF is evolving OpenFlow to accomplish this by defining common core protocol that is independent of datapath protocols (i.e., eliminates assumptions about switch functionality). This enables OpenFlow to be applied equally to any datapath technology. Protocol elements addressing specific datapath technologies are moved to separate specification modules. Network architecture considerations are captured in Table Type Patterns (TTPs) that define the capabilities of SDN elements playing specific roles in a network. Another aim of this work is to support emerging technologies for programmable dataplanes (e.g., the P4 datapath programming language). This presentation will describe how OpenFlow and related SDN software components are being (re-)structured to enhance the open source SDN ecosystem.