diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
deleted file mode 100644
index 51d32df..0000000
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
- * Copyright 2014-2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.provider.of.flow.impl;
-
-import com.google.common.collect.Lists;
-import org.onlab.packet.EthType;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.Ip4Prefix;
-import org.onlab.packet.Ip6Address;
-import org.onlab.packet.Ip6Prefix;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.MplsLabel;
-import org.onlab.packet.TpPort;
-import org.onlab.packet.VlanId;
-import org.onosproject.core.DefaultGroupId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.Lambda;
-import org.onosproject.net.OduSignalId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.driver.DefaultDriverData;
-import org.onosproject.net.driver.DefaultDriverHandler;
-import org.onosproject.net.driver.Driver;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.driver.DriverService;
-import org.onosproject.net.flow.DefaultFlowEntry;
-import org.onosproject.net.flow.DefaultFlowRule;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.FlowEntry;
-import org.onosproject.net.flow.FlowEntry.FlowEntryState;
-import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flow.criteria.ExtensionSelectorType.ExtensionSelectorTypes;
-import org.onosproject.net.flow.instructions.ExtensionTreatmentType.ExtensionTreatmentTypes;
-import org.onosproject.net.flow.instructions.Instructions;
-import org.onosproject.openflow.controller.ExtensionSelectorInterpreter;
-import org.onosproject.openflow.controller.ExtensionTreatmentInterpreter;
-import org.projectfloodlight.openflow.protocol.OFFlowMod;
-import org.projectfloodlight.openflow.protocol.OFFlowRemoved;
-import org.projectfloodlight.openflow.protocol.OFFlowStatsEntry;
-import org.projectfloodlight.openflow.protocol.OFMatchV3;
-import org.projectfloodlight.openflow.protocol.OFVersion;
-import org.projectfloodlight.openflow.protocol.action.OFAction;
-import org.projectfloodlight.openflow.protocol.action.OFActionCircuit;
-import org.projectfloodlight.openflow.protocol.action.OFActionEnqueue;
-import org.projectfloodlight.openflow.protocol.action.OFActionExperimenter;
-import org.projectfloodlight.openflow.protocol.action.OFActionGroup;
-import org.projectfloodlight.openflow.protocol.action.OFActionOutput;
-import org.projectfloodlight.openflow.protocol.action.OFActionPopMpls;
-import org.projectfloodlight.openflow.protocol.action.OFActionSetDlDst;
-import org.projectfloodlight.openflow.protocol.action.OFActionSetDlSrc;
-import org.projectfloodlight.openflow.protocol.action.OFActionSetField;
-import org.projectfloodlight.openflow.protocol.action.OFActionSetNwDst;
-import org.projectfloodlight.openflow.protocol.action.OFActionSetNwSrc;
-import org.projectfloodlight.openflow.protocol.action.OFActionSetQueue;
-import org.projectfloodlight.openflow.protocol.action.OFActionSetVlanPcp;
-import org.projectfloodlight.openflow.protocol.action.OFActionSetVlanVid;
-import org.projectfloodlight.openflow.protocol.instruction.OFInstruction;
-import org.projectfloodlight.openflow.protocol.instruction.OFInstructionApplyActions;
-import org.projectfloodlight.openflow.protocol.instruction.OFInstructionGotoTable;
-import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteActions;
-import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteMetadata;
-import org.projectfloodlight.openflow.protocol.match.Match;
-import org.projectfloodlight.openflow.protocol.match.MatchField;
-import org.projectfloodlight.openflow.protocol.oxm.OFOxm;
-import org.projectfloodlight.openflow.protocol.oxm.OFOxmOchSigid;
-import org.projectfloodlight.openflow.protocol.ver13.OFFactoryVer13;
-import org.projectfloodlight.openflow.types.CircuitSignalID;
-import org.projectfloodlight.openflow.types.IPv4Address;
-import org.projectfloodlight.openflow.types.IPv6Address;
-import org.projectfloodlight.openflow.types.Masked;
-import org.projectfloodlight.openflow.types.OFVlanVidMatch;
-import org.projectfloodlight.openflow.types.OduSignalID;
-import org.projectfloodlight.openflow.types.TransportPort;
-import org.projectfloodlight.openflow.types.U32;
-import org.projectfloodlight.openflow.types.U64;
-import org.projectfloodlight.openflow.types.U8;
-import org.projectfloodlight.openflow.types.VlanPcp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-import static org.onosproject.net.flow.criteria.Criteria.matchLambda;
-import static org.onosproject.net.flow.criteria.Criteria.matchOchSignalType;
-import static org.onosproject.net.flow.criteria.Criteria.matchOduSignalId;
-import static org.onosproject.net.flow.criteria.Criteria.matchOduSignalType;
-import static org.onosproject.net.flow.instructions.Instructions.modL0Lambda;
-import static org.onosproject.net.flow.instructions.Instructions.modL1OduSignalId;
-import static org.onosproject.provider.of.flow.impl.OpenFlowValueMapper.lookupChannelSpacing;
-import static org.onosproject.provider.of.flow.impl.OpenFlowValueMapper.lookupGridType;
-import static org.onosproject.provider.of.flow.impl.OpenFlowValueMapper.lookupOchSignalType;
-import static org.onosproject.provider.of.flow.impl.OpenFlowValueMapper.lookupOduSignalType;
-
-public class FlowEntryBuilder {
-    private static final Logger log = LoggerFactory.getLogger(FlowEntryBuilder.class);
-
-    private final OFFlowStatsEntry stat;
-    private final OFFlowRemoved removed;
-    private final OFFlowMod flowMod;
-
-    private final Match match;
-
-    // All actions are contained in an OFInstruction. For OF1.0
-    // the instruction type is apply instruction (immediate set in ONOS speak)
-    private final List<OFInstruction> instructions;
-
-    private final DeviceId deviceId;
-
-    public enum FlowType { STAT, REMOVED, MOD }
-
-    private final FlowType type;
-
-    private final DriverService driverService;
-
-    public FlowEntryBuilder(DeviceId deviceId, OFFlowStatsEntry entry, DriverService driverService) {
-        this.stat = entry;
-        this.match = entry.getMatch();
-        this.instructions = getInstructions(entry);
-        this.deviceId = deviceId;
-        this.removed = null;
-        this.flowMod = null;
-        this.type = FlowType.STAT;
-        this.driverService = driverService;
-    }
-
-    public FlowEntryBuilder(DeviceId deviceId, OFFlowRemoved removed, DriverService driverService) {
-        this.match = removed.getMatch();
-        this.removed = removed;
-        this.deviceId = deviceId;
-        this.instructions = null;
-        this.stat = null;
-        this.flowMod = null;
-        this.type = FlowType.REMOVED;
-        this.driverService = driverService;
-    }
-
-    public FlowEntryBuilder(DeviceId deviceId, OFFlowMod fm, DriverService driverService) {
-        this.match = fm.getMatch();
-        this.deviceId = deviceId;
-        this.instructions = getInstructions(fm);
-        this.type = FlowType.MOD;
-        this.flowMod = fm;
-        this.stat = null;
-        this.removed = null;
-        this.driverService = driverService;
-    }
-
-    public FlowEntry build(FlowEntryState... state) {
-        FlowRule.Builder builder;
-        try {
-            switch (this.type) {
-                case STAT:
-                    builder = DefaultFlowRule.builder()
-                            .forDevice(deviceId)
-                            .withSelector(buildSelector())
-                            .withTreatment(buildTreatment())
-                            .withPriority(stat.getPriority())
-                            .makeTemporary(stat.getIdleTimeout())
-                            .withCookie(stat.getCookie().getValue());
-                    if (stat.getVersion() != OFVersion.OF_10) {
-                        builder.forTable(stat.getTableId().getValue());
-                    }
-
-                    return new DefaultFlowEntry(builder.build(), FlowEntryState.ADDED,
-                                                stat.getDurationSec(),
-                                                stat.getPacketCount().getValue(),
-                                                stat.getByteCount().getValue());
-                case REMOVED:
-                    builder = DefaultFlowRule.builder()
-                            .forDevice(deviceId)
-                            .withSelector(buildSelector())
-                            .withPriority(removed.getPriority())
-                            .makeTemporary(removed.getIdleTimeout())
-                            .withCookie(removed.getCookie().getValue());
-                    if (removed.getVersion() != OFVersion.OF_10) {
-                        builder.forTable(removed.getTableId().getValue());
-                    }
-
-                    return new DefaultFlowEntry(builder.build(), FlowEntryState.REMOVED,
-                                                removed.getDurationSec(),
-                                                removed.getPacketCount().getValue(),
-                                                removed.getByteCount().getValue());
-                case MOD:
-                    FlowEntryState flowState = state.length > 0 ? state[0] : FlowEntryState.FAILED;
-                    builder = DefaultFlowRule.builder()
-                            .forDevice(deviceId)
-                            .withSelector(buildSelector())
-                            .withTreatment(buildTreatment())
-                            .withPriority(flowMod.getPriority())
-                            .makeTemporary(flowMod.getIdleTimeout())
-                            .withCookie(flowMod.getCookie().getValue());
-                    if (flowMod.getVersion() != OFVersion.OF_10) {
-                        builder.forTable(flowMod.getTableId().getValue());
-                    }
-
-                    return new DefaultFlowEntry(builder.build(), flowState, 0, 0, 0);
-                default:
-                    log.error("Unknown flow type : {}", this.type);
-                    return null;
-            }
-        } catch (UnsupportedOperationException e) {
-            log.warn("Error building flow entry", e);
-            return null;
-        }
-
-    }
-
-    private List<OFInstruction> getInstructions(OFFlowMod entry) {
-        switch (entry.getVersion()) {
-            case OF_10:
-                return Lists.newArrayList(OFFactoryVer13.INSTANCE.instructions()
-                                                  .applyActions(
-                                                          entry.getActions()));
-            case OF_11:
-            case OF_12:
-            case OF_13:
-                return entry.getInstructions();
-            default:
-                log.warn("Unknown OF version {}", entry.getVersion());
-        }
-        return Lists.newLinkedList();
-    }
-
-    private List<OFInstruction> getInstructions(OFFlowStatsEntry entry) {
-        switch (entry.getVersion()) {
-            case OF_10:
-                return Lists.newArrayList(
-                        OFFactoryVer13.INSTANCE.instructions().applyActions(entry.getActions()));
-            case OF_11:
-            case OF_12:
-            case OF_13:
-                return entry.getInstructions();
-            default:
-                log.warn("Unknown OF version {}", entry.getVersion());
-        }
-        return Lists.newLinkedList();
-    }
-
-    private TrafficTreatment buildTreatment() {
-        TrafficTreatment.Builder builder = DefaultTrafficTreatment.builder();
-        for (OFInstruction in : instructions) {
-            switch (in.getType()) {
-                case GOTO_TABLE:
-                    builder.transition(((int) ((OFInstructionGotoTable) in)
-                            .getTableId().getValue()));
-                    break;
-                case WRITE_METADATA:
-                    OFInstructionWriteMetadata m = (OFInstructionWriteMetadata) in;
-                    builder.writeMetadata(m.getMetadata().getValue(),
-                                          m.getMetadataMask().getValue());
-                    break;
-                case WRITE_ACTIONS:
-                    builder.deferred();
-                    buildActions(((OFInstructionWriteActions) in).getActions(),
-                                 builder);
-                    break;
-                case APPLY_ACTIONS:
-                    builder.immediate();
-                    buildActions(((OFInstructionApplyActions) in).getActions(),
-                                 builder);
-                    break;
-                case CLEAR_ACTIONS:
-                    builder.wipeDeferred();
-                    break;
-                case EXPERIMENTER:
-                    break;
-                case METER:
-                    break;
-                default:
-                    log.warn("Unknown instructions type {}", in.getType());
-            }
-        }
-
-        return builder.build();
-    }
-
-    /**
-     * Configures traffic treatment builder with a given collection of actions.
-     *
-     * @param actions a set of OpenFlow actions
-     * @param builder traffic treatment builder
-     * @param driverHandler driver handler
-     * @param deviceId device identifier
-     * @return configured traffic treatment builder
-     */
-    public static TrafficTreatment.Builder configureTreatmentBuilder(List<OFAction> actions,
-                                                                     TrafficTreatment.Builder builder,
-                                                                     DriverHandler driverHandler,
-                                                                     DeviceId deviceId) {
-        ExtensionTreatmentInterpreter interpreter;
-        if (driverHandler.hasBehaviour(ExtensionTreatmentInterpreter.class)) {
-            interpreter = driverHandler.behaviour(ExtensionTreatmentInterpreter.class);
-        } else {
-            interpreter = null;
-        }
-
-        for (OFAction act : actions) {
-            switch (act.getType()) {
-                case OUTPUT:
-                    OFActionOutput out = (OFActionOutput) act;
-                    builder.setOutput(
-                            PortNumber.portNumber(out.getPort().getPortNumber()));
-                    break;
-                case SET_VLAN_VID:
-                    OFActionSetVlanVid vlan = (OFActionSetVlanVid) act;
-                    builder.setVlanId(VlanId.vlanId(vlan.getVlanVid().getVlan()));
-                    break;
-                case SET_VLAN_PCP:
-                    OFActionSetVlanPcp pcp = (OFActionSetVlanPcp) act;
-                    builder.setVlanPcp(pcp.getVlanPcp().getValue());
-                    break;
-                case SET_DL_DST:
-                    OFActionSetDlDst dldst = (OFActionSetDlDst) act;
-                    builder.setEthDst(
-                            MacAddress.valueOf(dldst.getDlAddr().getLong()));
-                    break;
-                case SET_DL_SRC:
-                    OFActionSetDlSrc dlsrc = (OFActionSetDlSrc) act;
-                    builder.setEthSrc(
-                            MacAddress.valueOf(dlsrc.getDlAddr().getLong()));
-                    break;
-                case SET_NW_DST:
-                    OFActionSetNwDst nwdst = (OFActionSetNwDst) act;
-                    IPv4Address di = nwdst.getNwAddr();
-                    builder.setIpDst(Ip4Address.valueOf(di.getInt()));
-                    break;
-                case SET_NW_SRC:
-                    OFActionSetNwSrc nwsrc = (OFActionSetNwSrc) act;
-                    IPv4Address si = nwsrc.getNwAddr();
-                    builder.setIpSrc(Ip4Address.valueOf(si.getInt()));
-                    break;
-                case EXPERIMENTER:
-                    OFActionExperimenter exp = (OFActionExperimenter) act;
-                    if (exp.getExperimenter() == 0x80005A06 ||
-                            exp.getExperimenter() == 0x748771) {
-                        OFActionCircuit ct = (OFActionCircuit) exp;
-                        CircuitSignalID circuitSignalID = ((OFOxmOchSigid) ct.getField()).getValue();
-                        builder.add(Instructions.modL0Lambda(Lambda.ochSignal(
-                                lookupGridType(circuitSignalID.getGridType()),
-                                lookupChannelSpacing(circuitSignalID.getChannelSpacing()),
-                                circuitSignalID.getChannelNumber(), circuitSignalID.getSpectralWidth())));
-                    } else if (interpreter != null) {
-                        builder.extension(interpreter.mapAction(exp), deviceId);
-                    } else {
-                        log.warn("Unsupported OFActionExperimenter {}", exp.getExperimenter());
-                    }
-                    break;
-                case SET_FIELD:
-                    OFActionSetField setField = (OFActionSetField) act;
-                    handleSetField(builder, setField, driverHandler, deviceId);
-                    break;
-                case POP_MPLS:
-                    OFActionPopMpls popMpls = (OFActionPopMpls) act;
-                    builder.popMpls(new EthType(popMpls.getEthertype().getValue()));
-                    break;
-                case PUSH_MPLS:
-                    builder.pushMpls();
-                    break;
-                case COPY_TTL_IN:
-                    builder.copyTtlIn();
-                    break;
-                case COPY_TTL_OUT:
-                    builder.copyTtlOut();
-                    break;
-                case DEC_MPLS_TTL:
-                    builder.decMplsTtl();
-                    break;
-                case DEC_NW_TTL:
-                    builder.decNwTtl();
-                    break;
-                case GROUP:
-                    OFActionGroup group = (OFActionGroup) act;
-                    builder.group(new DefaultGroupId(group.getGroup().getGroupNumber()));
-                    break;
-                case SET_QUEUE:
-                    OFActionSetQueue setQueue = (OFActionSetQueue) act;
-                    builder.setQueue(setQueue.getQueueId());
-                    break;
-                case ENQUEUE:
-                    OFActionEnqueue enqueue = (OFActionEnqueue) act;
-                    builder.setQueue(enqueue.getQueueId(), PortNumber.portNumber(enqueue.getPort().getPortNumber()));
-                    break;
-                case STRIP_VLAN:
-                case POP_VLAN:
-                    builder.popVlan();
-                    break;
-                case PUSH_VLAN:
-                    builder.pushVlan();
-                    break;
-                case SET_TP_DST:
-                case SET_TP_SRC:
-                case POP_PBB:
-                case PUSH_PBB:
-                case SET_MPLS_LABEL:
-                case SET_MPLS_TC:
-                case SET_MPLS_TTL:
-                case SET_NW_ECN:
-                case SET_NW_TOS:
-                case SET_NW_TTL:
-
-                default:
-                    log.warn("Action type {} not yet implemented.", act.getType());
-            }
-        }
-        return builder;
-    }
-
-    private TrafficTreatment.Builder buildActions(List<OFAction> actions,
-                                                  TrafficTreatment.Builder builder) {
-        DriverHandler driverHandler = getDriver(deviceId);
-
-        return configureTreatmentBuilder(actions, builder, driverHandler, deviceId);
-    }
-
-
-    private static void handleSetField(TrafficTreatment.Builder builder,
-                                       OFActionSetField action,
-                                       DriverHandler driverHandler,
-                                       DeviceId deviceId) {
-        ExtensionTreatmentInterpreter treatmentInterpreter;
-        if (driverHandler.hasBehaviour(ExtensionTreatmentInterpreter.class)) {
-            treatmentInterpreter = driverHandler.behaviour(ExtensionTreatmentInterpreter.class);
-        } else {
-            treatmentInterpreter = null;
-        }
-
-        OFOxm<?> oxm = action.getField();
-        switch (oxm.getMatchField().id) {
-        case VLAN_PCP:
-            @SuppressWarnings("unchecked")
-            OFOxm<VlanPcp> vlanpcp = (OFOxm<VlanPcp>) oxm;
-            builder.setVlanPcp(vlanpcp.getValue().getValue());
-            break;
-        case VLAN_VID:
-            if (treatmentInterpreter != null &&
-                    treatmentInterpreter.supported(ExtensionTreatmentTypes.OFDPA_SET_VLAN_ID.type())) {
-                builder.extension(treatmentInterpreter.mapAction(action),
-                        deviceId);
-            } else {
-                @SuppressWarnings("unchecked")
-                OFOxm<OFVlanVidMatch> vlanvid = (OFOxm<OFVlanVidMatch>) oxm;
-                builder.setVlanId(VlanId.vlanId(vlanvid.getValue().getVlan()));
-            }
-            break;
-        case ETH_DST:
-            @SuppressWarnings("unchecked")
-            OFOxm<org.projectfloodlight.openflow.types.MacAddress> ethdst =
-                    (OFOxm<org.projectfloodlight.openflow.types.MacAddress>) oxm;
-            builder.setEthDst(MacAddress.valueOf(ethdst.getValue().getLong()));
-            break;
-        case ETH_SRC:
-            @SuppressWarnings("unchecked")
-            OFOxm<org.projectfloodlight.openflow.types.MacAddress> ethsrc =
-                    (OFOxm<org.projectfloodlight.openflow.types.MacAddress>) oxm;
-            builder.setEthSrc(MacAddress.valueOf(ethsrc.getValue().getLong()));
-            break;
-        case IPV4_DST:
-            @SuppressWarnings("unchecked")
-            OFOxm<IPv4Address> ip4dst = (OFOxm<IPv4Address>) oxm;
-            builder.setIpDst(Ip4Address.valueOf(ip4dst.getValue().getInt()));
-            break;
-        case IPV4_SRC:
-            @SuppressWarnings("unchecked")
-            OFOxm<IPv4Address> ip4src = (OFOxm<IPv4Address>) oxm;
-            builder.setIpSrc(Ip4Address.valueOf(ip4src.getValue().getInt()));
-            break;
-        case MPLS_LABEL:
-            @SuppressWarnings("unchecked")
-            OFOxm<U32> labelId = (OFOxm<U32>) oxm;
-            builder.setMpls(MplsLabel.mplsLabel((int) labelId.getValue().getValue()));
-            break;
-        case MPLS_BOS:
-            @SuppressWarnings("unchecked")
-            OFOxm<U8> mplsBos = (OFOxm<U8>) oxm;
-            builder.setMplsBos(mplsBos.getValue() == U8.ZERO ? false : true);
-            break;
-        case TUNNEL_ID:
-            @SuppressWarnings("unchecked")
-            OFOxm<U64> tunnelId = (OFOxm<U64>) oxm;
-            builder.setTunnelId(tunnelId.getValue().getValue());
-            break;
-        case TCP_DST:
-            @SuppressWarnings("unchecked")
-            OFOxm<TransportPort> tcpdst = (OFOxm<TransportPort>) oxm;
-            builder.setTcpDst(TpPort.tpPort(tcpdst.getValue().getPort()));
-            break;
-        case TCP_SRC:
-            @SuppressWarnings("unchecked")
-            OFOxm<TransportPort> tcpsrc = (OFOxm<TransportPort>) oxm;
-            builder.setTcpSrc(TpPort.tpPort(tcpsrc.getValue().getPort()));
-            break;
-        case UDP_DST:
-            @SuppressWarnings("unchecked")
-            OFOxm<TransportPort> udpdst = (OFOxm<TransportPort>) oxm;
-            builder.setUdpDst(TpPort.tpPort(udpdst.getValue().getPort()));
-            break;
-        case UDP_SRC:
-            @SuppressWarnings("unchecked")
-            OFOxm<TransportPort> udpsrc = (OFOxm<TransportPort>) oxm;
-            builder.setUdpSrc(TpPort.tpPort(udpsrc.getValue().getPort()));
-            break;
-        case TUNNEL_IPV4_DST:
-            if (treatmentInterpreter != null &&
-                    treatmentInterpreter.supported(ExtensionTreatmentTypes.NICIRA_SET_TUNNEL_DST.type())) {
-                builder.extension(treatmentInterpreter.mapAction(action), deviceId);
-            }
-            break;
-       case EXP_ODU_SIG_ID:
-            @SuppressWarnings("unchecked")
-            OFOxm<OduSignalID> oduID = (OFOxm<OduSignalID>) oxm;
-            OduSignalID oduSignalID = oduID.getValue();
-            OduSignalId oduSignalId = OduSignalId.oduSignalId(oduSignalID.getTpn(),
-                    oduSignalID.getTslen(),
-                    oduSignalID.getTsmap());
-            builder.add(modL1OduSignalId(oduSignalId));
-            break;
-        case EXP_OCH_SIG_ID:
-            try {
-                @SuppressWarnings("unchecked")
-                OFOxm<CircuitSignalID> ochId = (OFOxm<CircuitSignalID>) oxm;
-                CircuitSignalID circuitSignalID = ochId.getValue();
-                builder.add(modL0Lambda(Lambda.ochSignal(
-                        lookupGridType(circuitSignalID.getGridType()),
-                        lookupChannelSpacing(circuitSignalID.getChannelSpacing()),
-                        circuitSignalID.getChannelNumber(), circuitSignalID.getSpectralWidth())));
-            } catch (NoMappingFoundException e) {
-                log.warn(e.getMessage());
-                break;
-            }
-            break;
-        case ARP_OP:
-        case ARP_SHA:
-        case ARP_SPA:
-        case ARP_THA:
-        case ARP_TPA:
-        case BSN_EGR_PORT_GROUP_ID:
-        case BSN_GLOBAL_VRF_ALLOWED:
-        case BSN_IN_PORTS_128:
-        case BSN_L3_DST_CLASS_ID:
-        case BSN_L3_INTERFACE_CLASS_ID:
-        case BSN_L3_SRC_CLASS_ID:
-        case BSN_LAG_ID:
-        case BSN_TCP_FLAGS:
-        case BSN_UDF0:
-        case BSN_UDF1:
-        case BSN_UDF2:
-        case BSN_UDF3:
-        case BSN_UDF4:
-        case BSN_UDF5:
-        case BSN_UDF6:
-        case BSN_UDF7:
-        case BSN_VLAN_XLATE_PORT_GROUP_ID:
-        case BSN_VRF:
-        case ETH_TYPE:
-        case ICMPV4_CODE:
-        case ICMPV4_TYPE:
-        case ICMPV6_CODE:
-        case ICMPV6_TYPE:
-        case IN_PHY_PORT:
-        case IN_PORT:
-        case IPV6_DST:
-        case IPV6_FLABEL:
-        case IPV6_ND_SLL:
-        case IPV6_ND_TARGET:
-        case IPV6_ND_TLL:
-        case IPV6_SRC:
-        case IP_DSCP:
-        case IP_ECN:
-        case IP_PROTO:
-        case METADATA:
-        case MPLS_TC:
-        case OCH_SIGID:
-        case OCH_SIGID_BASIC:
-        case OCH_SIGTYPE:
-        case OCH_SIGTYPE_BASIC:
-        case SCTP_DST:
-        case SCTP_SRC:
-        case EXP_ODU_SIGTYPE:
-        case EXP_OCH_SIGTYPE:
-        default:
-            log.warn("Set field type {} not yet implemented.", oxm.getMatchField().id);
-            break;
-        }
-    }
-
-    // CHECKSTYLE IGNORE MethodLength FOR NEXT 1 LINES
-    private TrafficSelector buildSelector() {
-        MacAddress mac;
-        Ip4Prefix ip4Prefix;
-        Ip6Address ip6Address;
-        Ip6Prefix ip6Prefix;
-        Ip4Address ip;
-
-        DriverHandler driverHandler = getDriver(deviceId);
-        ExtensionSelectorInterpreter selectorInterpreter;
-        if (driverHandler.hasBehaviour(ExtensionSelectorInterpreter.class)) {
-            selectorInterpreter = driverHandler.behaviour(ExtensionSelectorInterpreter.class);
-        } else {
-            selectorInterpreter = null;
-        }
-
-        TrafficSelector.Builder builder = DefaultTrafficSelector.builder();
-        for (MatchField<?> field : match.getMatchFields()) {
-            switch (field.id) {
-            case IN_PORT:
-                builder.matchInPort(PortNumber
-                        .portNumber(match.get(MatchField.IN_PORT).getPortNumber()));
-                break;
-            case IN_PHY_PORT:
-                builder.matchInPhyPort(PortNumber
-                        .portNumber(match.get(MatchField.IN_PHY_PORT).getPortNumber()));
-                break;
-            case METADATA:
-                long metadata =
-                    match.get(MatchField.METADATA).getValue().getValue();
-                builder.matchMetadata(metadata);
-                break;
-            case ETH_DST:
-                if (match.isPartiallyMasked(MatchField.ETH_DST)) {
-                    Masked<org.projectfloodlight.openflow.types.MacAddress> maskedMac =
-                            match.getMasked(MatchField.ETH_DST);
-                    builder.matchEthDstMasked(MacAddress.valueOf(maskedMac.getValue().getLong()),
-                                              MacAddress.valueOf(maskedMac.getMask().getLong()));
-                } else {
-                    mac = MacAddress.valueOf(match.get(MatchField.ETH_DST).getLong());
-                    builder.matchEthDst(mac);
-                }
-                break;
-            case ETH_SRC:
-                if (match.isPartiallyMasked(MatchField.ETH_SRC)) {
-                    Masked<org.projectfloodlight.openflow.types.MacAddress> maskedMac =
-                            match.getMasked(MatchField.ETH_SRC);
-                    builder.matchEthSrcMasked(MacAddress.valueOf(maskedMac.getValue().getLong()),
-                                              MacAddress.valueOf(maskedMac.getMask().getLong()));
-                } else {
-                    mac = MacAddress.valueOf(match.get(MatchField.ETH_SRC).getLong());
-                    builder.matchEthSrc(mac);
-                }
-                break;
-            case ETH_TYPE:
-                int ethType = match.get(MatchField.ETH_TYPE).getValue();
-                builder.matchEthType((short) ethType);
-                break;
-            case VLAN_VID:
-                if (selectorInterpreter != null &&
-                        selectorInterpreter.supported(ExtensionSelectorTypes.OFDPA_MATCH_VLAN_VID.type())) {
-                    if (match.getVersion().equals(OFVersion.OF_13)) {
-                        OFOxm oxm = ((OFMatchV3) match).getOxmList().get(MatchField.VLAN_VID);
-                        builder.extension(selectorInterpreter.mapOxm(oxm),
-                                deviceId);
-                    } else {
-                        break;
-                    }
-                } else {
-                    VlanId vlanId = null;
-                    if (match.isPartiallyMasked(MatchField.VLAN_VID)) {
-                        Masked<OFVlanVidMatch> masked = match.getMasked(MatchField.VLAN_VID);
-                        if (masked.getValue().equals(OFVlanVidMatch.PRESENT)
-                                && masked.getMask().equals(OFVlanVidMatch.PRESENT)) {
-                            vlanId = VlanId.ANY;
-                        }
-                    } else {
-                        if (!match.get(MatchField.VLAN_VID).isPresentBitSet()) {
-                            vlanId = VlanId.NONE;
-                        } else {
-                            vlanId = VlanId.vlanId(match.get(MatchField.VLAN_VID).getVlan());
-                        }
-                    }
-                    if (vlanId != null) {
-                        builder.matchVlanId(vlanId);
-                    }
-                }
-                break;
-            case VLAN_PCP:
-                byte vlanPcp = match.get(MatchField.VLAN_PCP).getValue();
-                builder.matchVlanPcp(vlanPcp);
-                break;
-            case IP_DSCP:
-                byte ipDscp = match.get(MatchField.IP_DSCP).getDscpValue();
-                builder.matchIPDscp(ipDscp);
-                break;
-            case IP_ECN:
-                byte ipEcn = match.get(MatchField.IP_ECN).getEcnValue();
-                builder.matchIPEcn(ipEcn);
-                break;
-            case IP_PROTO:
-                short proto = match.get(MatchField.IP_PROTO).getIpProtocolNumber();
-                builder.matchIPProtocol((byte) proto);
-                break;
-            case IPV4_SRC:
-                if (match.isPartiallyMasked(MatchField.IPV4_SRC)) {
-                    Masked<IPv4Address> maskedIp = match.getMasked(MatchField.IPV4_SRC);
-                    ip4Prefix = Ip4Prefix.valueOf(
-                            maskedIp.getValue().getInt(),
-                            maskedIp.getMask().asCidrMaskLength());
-                } else {
-                    ip4Prefix = Ip4Prefix.valueOf(
-                            match.get(MatchField.IPV4_SRC).getInt(),
-                            Ip4Prefix.MAX_MASK_LENGTH);
-                }
-                builder.matchIPSrc(ip4Prefix);
-                break;
-            case IPV4_DST:
-                if (match.isPartiallyMasked(MatchField.IPV4_DST)) {
-                    Masked<IPv4Address> maskedIp = match.getMasked(MatchField.IPV4_DST);
-                    ip4Prefix = Ip4Prefix.valueOf(
-                            maskedIp.getValue().getInt(),
-                            maskedIp.getMask().asCidrMaskLength());
-                } else {
-                    ip4Prefix = Ip4Prefix.valueOf(
-                            match.get(MatchField.IPV4_DST).getInt(),
-                            Ip4Prefix.MAX_MASK_LENGTH);
-                }
-                builder.matchIPDst(ip4Prefix);
-                break;
-            case TCP_SRC:
-                builder.matchTcpSrc(TpPort.tpPort(match.get(MatchField.TCP_SRC).getPort()));
-                break;
-            case TCP_DST:
-                builder.matchTcpDst(TpPort.tpPort(match.get(MatchField.TCP_DST).getPort()));
-                break;
-            case UDP_SRC:
-                builder.matchUdpSrc(TpPort.tpPort(match.get(MatchField.UDP_SRC).getPort()));
-                break;
-            case UDP_DST:
-                builder.matchUdpDst(TpPort.tpPort(match.get(MatchField.UDP_DST).getPort()));
-                break;
-            case MPLS_LABEL:
-                builder.matchMplsLabel(MplsLabel.mplsLabel((int) match.get(MatchField.MPLS_LABEL)
-                                            .getValue()));
-                break;
-            case MPLS_BOS:
-                builder.matchMplsBos(match.get(MatchField.MPLS_BOS).getValue());
-                break;
-            case SCTP_SRC:
-                builder.matchSctpSrc(TpPort.tpPort(match.get(MatchField.SCTP_SRC).getPort()));
-                break;
-            case SCTP_DST:
-                builder.matchSctpDst(TpPort.tpPort(match.get(MatchField.SCTP_DST).getPort()));
-                break;
-            case ICMPV4_TYPE:
-                byte icmpType = (byte) match.get(MatchField.ICMPV4_TYPE).getType();
-                builder.matchIcmpType(icmpType);
-                break;
-            case ICMPV4_CODE:
-                byte icmpCode = (byte) match.get(MatchField.ICMPV4_CODE).getCode();
-                builder.matchIcmpCode(icmpCode);
-                break;
-            case IPV6_SRC:
-                if (match.isPartiallyMasked(MatchField.IPV6_SRC)) {
-                    Masked<IPv6Address> maskedIp = match.getMasked(MatchField.IPV6_SRC);
-                    ip6Prefix = Ip6Prefix.valueOf(
-                            maskedIp.getValue().getBytes(),
-                            maskedIp.getMask().asCidrMaskLength());
-                } else {
-                    ip6Prefix = Ip6Prefix.valueOf(
-                            match.get(MatchField.IPV6_SRC).getBytes(),
-                            Ip6Prefix.MAX_MASK_LENGTH);
-                }
-                builder.matchIPv6Src(ip6Prefix);
-                break;
-            case IPV6_DST:
-                if (match.isPartiallyMasked(MatchField.IPV6_DST)) {
-                    Masked<IPv6Address> maskedIp = match.getMasked(MatchField.IPV6_DST);
-                    ip6Prefix = Ip6Prefix.valueOf(
-                            maskedIp.getValue().getBytes(),
-                            maskedIp.getMask().asCidrMaskLength());
-                } else {
-                    ip6Prefix = Ip6Prefix.valueOf(
-                            match.get(MatchField.IPV6_DST).getBytes(),
-                            Ip6Prefix.MAX_MASK_LENGTH);
-                }
-                builder.matchIPv6Dst(ip6Prefix);
-                break;
-            case IPV6_FLABEL:
-                int flowLabel =
-                    match.get(MatchField.IPV6_FLABEL).getIPv6FlowLabelValue();
-                builder.matchIPv6FlowLabel(flowLabel);
-                break;
-            case ICMPV6_TYPE:
-                byte icmpv6type = (byte) match.get(MatchField.ICMPV6_TYPE).getValue();
-                builder.matchIcmpv6Type(icmpv6type);
-                break;
-            case ICMPV6_CODE:
-                byte icmpv6code = (byte) match.get(MatchField.ICMPV6_CODE).getValue();
-                builder.matchIcmpv6Code(icmpv6code);
-                break;
-            case IPV6_ND_TARGET:
-                ip6Address =
-                    Ip6Address.valueOf(match.get(MatchField.IPV6_ND_TARGET).getBytes());
-                builder.matchIPv6NDTargetAddress(ip6Address);
-                break;
-            case IPV6_ND_SLL:
-                mac = MacAddress.valueOf(match.get(MatchField.IPV6_ND_SLL).getLong());
-                builder.matchIPv6NDSourceLinkLayerAddress(mac);
-                break;
-            case IPV6_ND_TLL:
-                mac = MacAddress.valueOf(match.get(MatchField.IPV6_ND_TLL).getLong());
-                builder.matchIPv6NDTargetLinkLayerAddress(mac);
-                break;
-            case IPV6_EXTHDR:
-                builder.matchIPv6ExthdrFlags((short) match.get(MatchField.IPV6_EXTHDR)
-                        .getValue());
-                break;
-            case OCH_SIGID:
-                CircuitSignalID sigId = match.get(MatchField.OCH_SIGID);
-                builder.add(matchLambda(Lambda.ochSignal(
-                                lookupGridType(sigId.getGridType()), lookupChannelSpacing(sigId.getChannelSpacing()),
-                                sigId.getChannelNumber(), sigId.getSpectralWidth())
-                ));
-                break;
-            case OCH_SIGTYPE:
-                U8 sigType = match.get(MatchField.OCH_SIGTYPE);
-                builder.add(matchOchSignalType(lookupOchSignalType((byte) sigType.getValue())));
-                break;
-            case EXP_OCH_SIG_ID:
-                try {
-                    CircuitSignalID expSigId = match.get(MatchField.EXP_OCH_SIG_ID);
-                    builder.add(matchLambda(Lambda.ochSignal(
-                            lookupGridType(expSigId.getGridType()), lookupChannelSpacing(expSigId.getChannelSpacing()),
-                            expSigId.getChannelNumber(), expSigId.getSpectralWidth())));
-                } catch (NoMappingFoundException e) {
-                    log.warn(e.getMessage());
-                    break;
-                }
-                break;
-            case EXP_OCH_SIGTYPE:
-                try {
-                    U8 expOchSigType = match.get(MatchField.EXP_OCH_SIGTYPE);
-                    builder.add(matchOchSignalType(lookupOchSignalType((byte) expOchSigType.getValue())));
-                } catch (NoMappingFoundException e) {
-                    log.warn(e.getMessage());
-                    break;
-                }
-                break;
-            case EXP_ODU_SIG_ID:
-                OduSignalId oduSignalId = OduSignalId.oduSignalId(match.get(MatchField.EXP_ODU_SIG_ID).getTpn(),
-                        match.get(MatchField.EXP_ODU_SIG_ID).getTslen(),
-                        match.get(MatchField.EXP_ODU_SIG_ID).getTsmap());
-                builder.add(matchOduSignalId(oduSignalId));
-            break;
-            case EXP_ODU_SIGTYPE:
-                try {
-                    U8 oduSigType = match.get(MatchField.EXP_ODU_SIGTYPE);
-                    builder.add(matchOduSignalType(lookupOduSignalType((byte) oduSigType.getValue())));
-                } catch (NoMappingFoundException e) {
-                    log.warn(e.getMessage());
-                    break;
-                }
-                break;
-            case TUNNEL_ID:
-                long tunnelId = match.get(MatchField.TUNNEL_ID).getValue();
-                builder.matchTunnelId(tunnelId);
-                break;
-            case ARP_OP:
-                int arpOp = match.get(MatchField.ARP_OP).getOpcode();
-                builder.matchArpOp(arpOp);
-                break;
-            case ARP_SHA:
-                mac = MacAddress.valueOf(match.get(MatchField.ARP_SHA).getLong());
-                builder.matchArpSha(mac);
-                break;
-            case ARP_SPA:
-                ip = Ip4Address.valueOf(match.get(MatchField.ARP_SPA).getInt());
-                builder.matchArpSpa(ip);
-                break;
-            case ARP_THA:
-                mac = MacAddress.valueOf(match.get(MatchField.ARP_THA).getLong());
-                builder.matchArpTha(mac);
-                break;
-            case ARP_TPA:
-                ip = Ip4Address.valueOf(match.get(MatchField.ARP_TPA).getInt());
-                builder.matchArpTpa(ip);
-                break;
-            case MPLS_TC:
-            default:
-                log.warn("Match type {} not yet implemented.", field.id);
-            }
-        }
-        return builder.build();
-    }
-
-    private DriverHandler getDriver(DeviceId deviceId) {
-        Driver driver = driverService.getDriver(deviceId);
-        DriverHandler handler = new DefaultDriverHandler(new DefaultDriverData(driver, deviceId));
-        return handler;
-    }
-}
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
index 4cdbb83..21e44c6 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
@@ -64,6 +64,8 @@
 import org.onosproject.net.flow.criteria.VlanIdCriterion;
 import org.onosproject.net.flow.criteria.VlanPcpCriterion;
 import org.onosproject.openflow.controller.ExtensionSelectorInterpreter;
+import org.onosproject.provider.of.flow.util.NoMappingFoundException;
+import org.onosproject.provider.of.flow.util.OpenFlowValueMapper;
 import org.projectfloodlight.openflow.protocol.OFFactory;
 import org.projectfloodlight.openflow.protocol.OFFlowMod;
 import org.projectfloodlight.openflow.protocol.match.Match;
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
index 70b7e68..1b9ef5d 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -54,6 +54,8 @@
 import org.onosproject.net.flow.instructions.L4ModificationInstruction;
 import org.onosproject.net.flow.instructions.L4ModificationInstruction.ModTransportPortInstruction;
 import org.onosproject.openflow.controller.ExtensionTreatmentInterpreter;
+import org.onosproject.provider.of.flow.util.NoMappingFoundException;
+import org.onosproject.provider.of.flow.util.OpenFlowValueMapper;
 import org.projectfloodlight.openflow.protocol.OFFactory;
 import org.projectfloodlight.openflow.protocol.OFFlowAdd;
 import org.projectfloodlight.openflow.protocol.OFFlowDeleteStrict;
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NoMappingFoundException.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NoMappingFoundException.java
deleted file mode 100644
index 898b286..0000000
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NoMappingFoundException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.provider.of.flow.impl;
-
-/**
- * Thrown to indicate that no mapping for the input value is found.
- */
-public class NoMappingFoundException extends RuntimeException {
-    /**
-     * Creates an instance with the specified values.
-     *
-     * @param input input value of mapping causing this exception
-     * @param output the desired class which the input value is mapped to
-     */
-    public NoMappingFoundException(Object input, Class<?> output) {
-        super(String.format("No mapping found for %s when converting to %s", input, output.getName()));
-    }
-}
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
index 7bf5878..bbf1436 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
@@ -53,6 +53,7 @@
 import org.onosproject.openflow.controller.OpenFlowSwitchListener;
 import org.onosproject.openflow.controller.RoleState;
 import org.onosproject.openflow.controller.ThirdPartyMessage;
+import org.onosproject.provider.of.flow.util.FlowEntryBuilder;
 import org.osgi.service.component.ComponentContext;
 import org.projectfloodlight.openflow.protocol.OFBadRequestCode;
 import org.projectfloodlight.openflow.protocol.OFBarrierRequest;
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowValueMapper.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowValueMapper.java
deleted file mode 100644
index 556f76f..0000000
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowValueMapper.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.provider.of.flow.impl;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.EnumHashBiMap;
-import org.onosproject.net.ChannelSpacing;
-import org.onosproject.net.GridType;
-import org.onosproject.net.OchSignalType;
-import org.onosproject.net.OduSignalType;
-
-/**
- * Collection of helper methods to convert protocol agnostic models to values used in OpenFlow spec.
- */
-final class OpenFlowValueMapper {
-
-    // prohibit instantiation
-    private OpenFlowValueMapper() {}
-
-    private static final BiMap<GridType, Byte> GRID_TYPES = EnumHashBiMap.create(GridType.class);
-    static {
-        // See ONF "Optical Transport Protocol Extensions Version 1.0" for the following values
-        GRID_TYPES.put(GridType.DWDM, (byte) 1); // OFPGRIDT_DWDM of enum ofp_grid_type
-        GRID_TYPES.put(GridType.CWDM, (byte) 2); // OFPGRIDT_CWDM of enum ofp_grid_type
-        GRID_TYPES.put(GridType.FLEX, (byte) 3); // OFPGRIDT_FLEX of enum ofp_grid_type
-    }
-
-    private static final BiMap<ChannelSpacing, Byte> CHANNEL_SPACING = EnumHashBiMap.create(ChannelSpacing.class);
-    static {
-        // See ONF "Optical Transport Protocol Extensions Version 1.0" for the following values
-        CHANNEL_SPACING.put(ChannelSpacing.CHL_100GHZ, (byte) 1);   // OFPCS_100GHZ of enum ofp_chl_spacing
-        CHANNEL_SPACING.put(ChannelSpacing.CHL_50GHZ, (byte) 2);    // OFPCS_50GHZ of enum ofp_chl_spacing
-        CHANNEL_SPACING.put(ChannelSpacing.CHL_25GHZ, (byte) 3);    // OFPCS_25GHZ of enum ofp_chl_spacing
-        CHANNEL_SPACING.put(ChannelSpacing.CHL_12P5GHZ, (byte) 4);  // OFPCS_12P5GHZ of enum ofp_chl_spacing
-        CHANNEL_SPACING.put(ChannelSpacing.CHL_6P25GHZ, (byte) 5);  // OFPCS_6P25GHZ of enum ofp_chl_spacing
-    }
-
-    private static final BiMap<OchSignalType, Byte> OCH_SIGNAL_TYPES = EnumHashBiMap.create(OchSignalType.class);
-    static {
-        // See ONF "Optical Transport Protocol Extensions Version 1.0" for the following values
-        OCH_SIGNAL_TYPES.put(OchSignalType.FIXED_GRID, (byte) 1); // OFPOCHT_FIX_GRID of enum ofp_och_signal_type
-        OCH_SIGNAL_TYPES.put(OchSignalType.FLEX_GRID, (byte) 2);  // OFPOCHT_FLEX_GRID of enum ofp_och_signal_type
-    }
-
-    private static final BiMap<OduSignalType, Byte> ODU_SIGNAL_TYPES = EnumHashBiMap.create(OduSignalType.class);
-    static {
-        // See ONF "Optical Transport Protocol Extensions Version 1.0" for the following values
-        ODU_SIGNAL_TYPES.put(OduSignalType.ODU1, (byte) 1);         // OFPODUT_ODU1 of enum ofp_odu_signal_type
-        ODU_SIGNAL_TYPES.put(OduSignalType.ODU2, (byte) 2);         // OFPODUT_ODU2 of enum ofp_odu_signal_type
-        ODU_SIGNAL_TYPES.put(OduSignalType.ODU3, (byte) 3);         // OFPODUT_ODU3 of enum ofp_odu_signal_type
-        ODU_SIGNAL_TYPES.put(OduSignalType.ODU4, (byte) 4);         // OFPODUT_ODU4 of enum ofp_odu_signal_type
-        ODU_SIGNAL_TYPES.put(OduSignalType.ODU0, (byte) 10);        // OFPODUT_ODU0 of enum ofp_odu_signal_type
-        ODU_SIGNAL_TYPES.put(OduSignalType.ODU2e, (byte) 11);       // OFPODUT_ODU2E of enum ofp_odu_signal_type
-    }
-
-    /**
-     * Looks up the specified input value to the corresponding value with the specified map.
-     *
-     * @param map bidirectional mapping
-     * @param input input value
-     * @param cls class of output value
-     * @param <I> type of input value
-     * @param <O> type of output value
-     * @return the corresponding value stored in the specified map
-     * @throws NoMappingFoundException if no corresponding value is found
-     */
-    private static <I, O> O lookup(BiMap<I, O> map, I input, Class<O> cls) {
-        if (!map.containsKey(input)) {
-            throw new NoMappingFoundException(input, cls);
-        }
-
-        return map.get(input);
-    }
-
-    /**
-     * Looks up the corresponding byte value defined in
-     * ONF "Optical Transport Protocol Extensions Version 1.0"
-     * from the specified {@link GridType} instance.
-     *
-     * @param type grid type
-     * @return the byte value corresponding to the specified grid type
-     * @throws NoMappingFoundException if the specified grid type is not found
-     */
-    static byte lookupGridType(GridType type) {
-        return lookup(GRID_TYPES, type, Byte.class);
-    }
-
-    /**
-     * Looks up the corresponding {@link GridType} instance
-     * from the specified byte value for grid type
-     * defined in ONF "Optical Transport Protocol Extensions Version 1.0".
-     *
-     * @param type byte value as grid type defined the spec
-     * @return the corresponding GridType instance
-     */
-    static GridType lookupGridType(byte type) {
-        return lookup(GRID_TYPES.inverse(), type, GridType.class);
-    }
-
-    /**
-     * Looks up the corresponding byte value for channel spacing defined in
-     * ONF "Optical Transport Protocol Extensions Version 1.0"
-     * from the specified {@link ChannelSpacing} instance.
-     *
-     * @param spacing channel spacing
-     * @return byte value corresponding to the specified channel spacing
-     * @throws NoMappingFoundException if the specified channel spacing is not found
-     */
-    static byte lookupChannelSpacing(ChannelSpacing spacing) {
-        return lookup(CHANNEL_SPACING, spacing, Byte.class);
-    }
-
-    /**
-     * Looks up the corresponding {@link ChannelSpacing} instance
-     * from the specified byte value for channel spacing
-     * defined in ONF "Optical Transport Protocol Extensions Version 1.0".
-     *
-     * @param spacing byte value as channel spacing defined the spec
-     * @return the corresponding ChannelSpacing instance
-     * @throws NoMappingFoundException if the specified channel spacing is not found
-     */
-    static ChannelSpacing lookupChannelSpacing(byte spacing) {
-        return lookup(CHANNEL_SPACING.inverse(), spacing, ChannelSpacing.class);
-    }
-
-    /**
-     * Looks up the corresponding byte value for Och signal type defined in
-     * ONF "Optical Transport Protocol Extensions Version 1.0"
-     * from the specified {@link OchSignalType} instance.
-     *
-     * @param signalType optical signal type
-     * @return byte value corresponding to the specified OCh signal type
-     * @throws NoMappingFoundException if the specified Och signal type is not found
-     */
-    static byte lookupOchSignalType(OchSignalType signalType) {
-        return lookup(OCH_SIGNAL_TYPES, signalType, Byte.class);
-    }
-
-    /**
-     * Looks up the the corresponding {@link OchSignalType} instance
-     * from the specified byte value for Och signal type defined in
-     * ONF "Optical Transport Protocol Extensions Version 1.0".
-     *
-     * @param signalType byte value as Och singal type defined the spec
-     * @return the corresponding OchSignalType instance
-     * @throws NoMappingFoundException if the specified Och signal type is not found
-     */
-    static OchSignalType lookupOchSignalType(byte signalType) {
-        return lookup(OCH_SIGNAL_TYPES.inverse(), signalType, OchSignalType.class);
-    }
-
-    /**
-     * Looks up the corresponding byte value for ODU signal type defined in
-     * ONF "Optical Transport Protocol Extensions Version 1.0"
-     * from the specified {@link OchSignalType} instance.
-     *
-     * @param signalType ODU (Optical channel Data Unit) signal type
-     * @return byte value corresponding to the specified ODU signal type
-     * @throws NoMappingFoundException if the specified ODU signal type is not found
-     */
-    static byte lookupOduSignalType(OduSignalType signalType) {
-        return lookup(ODU_SIGNAL_TYPES, signalType, Byte.class);
-    }
-
-    /**
-     * Looks up the the corresponding {@link OchSignalType} instance
-     * from the specified byte value for ODU signal type defined in
-     * ONF "Optical Transport Protocol Extensions Version 1.0".
-     *
-     * @param signalType byte value as ODU (Optical channel Data Unit) signal type defined the spec
-     * @return the corresponding OchSignalType instance
-     * @throws NoMappingFoundException if the specified ODU signal type is not found
-     */
-    static OduSignalType lookupOduSignalType(byte signalType) {
-        return lookup(ODU_SIGNAL_TYPES.inverse(), signalType, OduSignalType.class);
-    }
-}