diff --git a/BUCK b/apps/xran/BUCK
similarity index 100%
rename from BUCK
rename to apps/xran/BUCK
diff --git a/src/main/java/org.onosproject.xran/XranStore.java b/apps/xran/src/main/java/org.onosproject.xran/XranStore.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/XranStore.java
rename to apps/xran/src/main/java/org.onosproject.xran/XranStore.java
diff --git a/src/main/java/org.onosproject.xran/annotations/Patch.java b/apps/xran/src/main/java/org.onosproject.xran/annotations/Patch.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/annotations/Patch.java
rename to apps/xran/src/main/java/org.onosproject.xran/annotations/Patch.java
diff --git a/src/main/java/org.onosproject.xran/annotations/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/annotations/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/annotations/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/annotations/package-info.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ARFCNValue.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ARFCNValue.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ARFCNValue.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ARFCNValue.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/AdmEstCause.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/AdmEstCause.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/AdmEstCause.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/AdmEstCause.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/AdmEstResponse.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/AdmEstResponse.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/AdmEstResponse.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/AdmEstResponse.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/AdmEstStatus.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/AdmEstStatus.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/AdmEstStatus.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/AdmEstStatus.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/BitRate.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/BitRate.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/BitRate.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/BitRate.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/CACap.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/CACap.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/CACap.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/CACap.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/CRNTI.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/CRNTI.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/CRNTI.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/CRNTI.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/CandScell.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/CandScell.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/CandScell.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/CandScell.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/DCCap.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/DCCap.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/DCCap.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/DCCap.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/DuplexMode.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/DuplexMode.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/DuplexMode.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/DuplexMode.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ECGI.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ECGI.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ECGI.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ECGI.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ENBUES1APID.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ENBUES1APID.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ENBUES1APID.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ENBUES1APID.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ERABDecision.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABDecision.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ERABDecision.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABDecision.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ERABDirection.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABDirection.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ERABDirection.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABDirection.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ERABID.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABID.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ERABID.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABID.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ERABParams.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABParams.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ERABParams.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABParams.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ERABParamsItem.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABParamsItem.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ERABParamsItem.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABParamsItem.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ERABResponse.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABResponse.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ERABResponse.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABResponse.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ERABResponseItem.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABResponseItem.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ERABResponseItem.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABResponseItem.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ERABType.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABType.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ERABType.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ERABType.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/EUTRANCellIdentifier.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/EUTRANCellIdentifier.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/EUTRANCellIdentifier.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/EUTRANCellIdentifier.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/HOFailureCause.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/HOFailureCause.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/HOFailureCause.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/HOFailureCause.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/MMEUES1APID.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/MMEUES1APID.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/MMEUES1APID.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/MMEUES1APID.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/PCIARFCN.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/PCIARFCN.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/PCIARFCN.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/PCIARFCN.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/PLMNIdentity.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/PLMNIdentity.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/PLMNIdentity.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/PLMNIdentity.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/PRBUsage.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/PRBUsage.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/PRBUsage.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/PRBUsage.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/PhysCellId.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/PhysCellId.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/PhysCellId.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/PhysCellId.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/PropScell.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/PropScell.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/PropScell.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/PropScell.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/QCI.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/QCI.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/QCI.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/QCI.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/RSRPRange.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/RSRPRange.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/RSRPRange.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/RSRPRange.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/RSRQRange.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/RSRQRange.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/RSRQRange.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/RSRQRange.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/RXSigMeasRepInterval.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/RXSigMeasRepInterval.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/RXSigMeasRepInterval.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/RXSigMeasRepInterval.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/RXSigRepQty.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/RXSigRepQty.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/RXSigRepQty.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/RXSigRepQty.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/RXSigReport.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/RXSigReport.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/RXSigReport.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/RXSigReport.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/RadioRepPerServCell.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/RadioRepPerServCell.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/RadioRepPerServCell.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/RadioRepPerServCell.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ReconfIndReason.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/ReconfIndReason.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/ReconfIndReason.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/ReconfIndReason.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/RelCause.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/RelCause.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/RelCause.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/RelCause.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/SchedMeasRepPerServCell.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/SchedMeasRepPerServCell.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/SchedMeasRepPerServCell.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/SchedMeasRepPerServCell.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/TrafficSplitPercentage.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/TrafficSplitPercentage.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/TrafficSplitPercentage.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/TrafficSplitPercentage.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/UEAMBR.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/UEAMBR.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/UEAMBR.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/UEAMBR.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/XICICPA.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/XICICPA.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/XICICPA.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/XICICPA.java
diff --git a/src/main/java/org.onosproject.xran/codecs/api/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/api/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/api/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/api/package-info.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/BerByteArrayOutputStream.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/BerByteArrayOutputStream.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/BerByteArrayOutputStream.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/BerByteArrayOutputStream.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/BerLength.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/BerLength.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/BerLength.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/BerLength.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/BerTag.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/BerTag.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/BerTag.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/BerTag.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/internal/Util.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/internal/Util.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/internal/Util.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/internal/Util.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerAny.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerAny.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerAny.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerAny.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerBitString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerBitString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerBitString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerBitString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerBoolean.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerBoolean.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerBoolean.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerBoolean.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerDate.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerDate.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerDate.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerDate.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerDateTime.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerDateTime.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerDateTime.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerDateTime.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerDuration.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerDuration.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerDuration.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerDuration.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerEmbeddedPdv.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerEmbeddedPdv.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerEmbeddedPdv.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerEmbeddedPdv.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerEnum.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerEnum.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerEnum.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerEnum.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerGeneralizedTime.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerGeneralizedTime.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerGeneralizedTime.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerGeneralizedTime.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerInteger.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerInteger.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerInteger.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerInteger.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerNull.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerNull.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerNull.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerNull.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerObjectIdentifier.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerObjectIdentifier.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerObjectIdentifier.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerObjectIdentifier.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerOctetString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerOctetString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerOctetString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerOctetString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerReal.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerReal.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerReal.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerReal.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerTime.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerTime.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerTime.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerTime.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerTimeOfDay.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerTimeOfDay.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerTimeOfDay.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerTimeOfDay.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/BerUtcTime.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerUtcTime.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/BerUtcTime.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/BerUtcTime.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerBMPString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerBMPString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerBMPString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerBMPString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerGeneralString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerGeneralString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerGeneralString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerGeneralString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerGraphicString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerGraphicString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerGraphicString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerGraphicString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerIA5String.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerIA5String.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerIA5String.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerIA5String.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerNumericString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerNumericString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerNumericString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerNumericString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerObjectDescriptor.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerObjectDescriptor.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerObjectDescriptor.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerObjectDescriptor.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerPrintableString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerPrintableString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerPrintableString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerPrintableString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerTeletexString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerTeletexString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerTeletexString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerTeletexString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerUTF8String.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerUTF8String.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerUTF8String.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerUTF8String.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerUniversalString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerUniversalString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerUniversalString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerUniversalString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerVideotexString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerVideotexString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerVideotexString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerVideotexString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerVisibleString.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerVisibleString.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/ber/types/string/BerVisibleString.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/ber/types/string/BerVisibleString.java
diff --git a/src/main/java/org.onosproject.xran/codecs/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/package-info.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionRequest.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionRequest.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionRequest.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionRequest.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionResponse.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionResponse.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionResponse.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionResponse.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionStatus.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionStatus.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionStatus.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionStatus.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/BearerReleaseInd.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/BearerReleaseInd.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/BearerReleaseInd.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/BearerReleaseInd.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigReport.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigReport.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/CellConfigReport.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigReport.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigRequest.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigRequest.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/CellConfigRequest.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigRequest.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/HOComplete.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/HOComplete.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/HOComplete.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/HOComplete.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/HOFailure.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/HOFailure.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/HOFailure.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/HOFailure.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/HORequest.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/HORequest.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/HORequest.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/HORequest.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/L2MeasConfig.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/L2MeasConfig.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/L2MeasConfig.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/L2MeasConfig.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/PDCPMeasReportPerUe.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/PDCPMeasReportPerUe.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/PDCPMeasReportPerUe.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/PDCPMeasReportPerUe.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfig.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfig.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/RRMConfig.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfig.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfigStatus.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfigStatus.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/RRMConfigStatus.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfigStatus.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasConfig.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasConfig.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasConfig.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasConfig.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasReport.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasReport.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasReport.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasReport.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerCell.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerCell.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerCell.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerCell.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerUE.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerUE.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerUE.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerUE.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/ScellAdd.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/ScellAdd.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/ScellAdd.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/ScellAdd.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/ScellAddStatus.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/ScellAddStatus.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/ScellAddStatus.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/ScellAddStatus.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/ScellDelete.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/ScellDelete.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/ScellDelete.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/ScellDelete.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerCell.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerCell.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerCell.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerCell.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerUE.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerUE.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerUE.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerUE.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAdd.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAdd.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/SeNBAdd.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAdd.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAddStatus.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAddStatus.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/SeNBAddStatus.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAddStatus.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SeNBDelete.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SeNBDelete.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/SeNBDelete.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/SeNBDelete.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/TrafficSplitConfig.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/TrafficSplitConfig.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/TrafficSplitConfig.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/TrafficSplitConfig.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionRequest.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionRequest.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionRequest.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionRequest.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionResponse.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionResponse.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionResponse.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionResponse.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionStatus.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionStatus.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionStatus.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionStatus.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityEnquiry.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityEnquiry.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityEnquiry.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityEnquiry.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityInfo.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityInfo.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityInfo.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityInfo.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEContextUpdate.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEContextUpdate.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/UEContextUpdate.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEContextUpdate.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEReconfigInd.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEReconfigInd.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/UEReconfigInd.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEReconfigInd.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEReleaseInd.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEReleaseInd.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/UEReleaseInd.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/UEReleaseInd.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XICICConfig.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XICICConfig.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/XICICConfig.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XICICConfig.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XrancApiID.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XrancApiID.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/XrancApiID.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XrancApiID.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XrancPdu.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XrancPdu.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/XrancPdu.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XrancPdu.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduBody.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduBody.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/XrancPduBody.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduBody.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduHdr.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduHdr.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/XrancPduHdr.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduHdr.java
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/pdu/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/pdu/package-info.java
diff --git a/src/main/java/org.onosproject.xran/codecs/util/HexConverter.java b/apps/xran/src/main/java/org.onosproject.xran/codecs/util/HexConverter.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/codecs/util/HexConverter.java
rename to apps/xran/src/main/java/org.onosproject.xran/codecs/util/HexConverter.java
diff --git a/src/main/java/org.onosproject.xran/controller/Controller.java b/apps/xran/src/main/java/org.onosproject.xran/controller/Controller.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/controller/Controller.java
rename to apps/xran/src/main/java/org.onosproject.xran/controller/Controller.java
diff --git a/src/main/java/org.onosproject.xran/controller/XranChannelHandler.java b/apps/xran/src/main/java/org.onosproject.xran/controller/XranChannelHandler.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/controller/XranChannelHandler.java
rename to apps/xran/src/main/java/org.onosproject.xran/controller/XranChannelHandler.java
diff --git a/src/main/java/org.onosproject.xran/controller/XranController.java b/apps/xran/src/main/java/org.onosproject.xran/controller/XranController.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/controller/XranController.java
rename to apps/xran/src/main/java/org.onosproject.xran/controller/XranController.java
diff --git a/src/main/java/org.onosproject.xran/controller/XranControllerImpl.java b/apps/xran/src/main/java/org.onosproject.xran/controller/XranControllerImpl.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/controller/XranControllerImpl.java
rename to apps/xran/src/main/java/org.onosproject.xran/controller/XranControllerImpl.java
diff --git a/src/main/java/org.onosproject.xran/controller/XranDeviceAgent.java b/apps/xran/src/main/java/org.onosproject.xran/controller/XranDeviceAgent.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/controller/XranDeviceAgent.java
rename to apps/xran/src/main/java/org.onosproject.xran/controller/XranDeviceAgent.java
diff --git a/src/main/java/org.onosproject.xran/controller/XranHostAgent.java b/apps/xran/src/main/java/org.onosproject.xran/controller/XranHostAgent.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/controller/XranHostAgent.java
rename to apps/xran/src/main/java/org.onosproject.xran/controller/XranHostAgent.java
diff --git a/src/main/java/org.onosproject.xran/controller/XranPacketProcessor.java b/apps/xran/src/main/java/org.onosproject.xran/controller/XranPacketProcessor.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/controller/XranPacketProcessor.java
rename to apps/xran/src/main/java/org.onosproject.xran/controller/XranPacketProcessor.java
diff --git a/src/main/java/org.onosproject.xran/controller/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/controller/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/controller/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/controller/package-info.java
diff --git a/src/main/java/org.onosproject.xran/entities/RnibCell.java b/apps/xran/src/main/java/org.onosproject.xran/entities/RnibCell.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/entities/RnibCell.java
rename to apps/xran/src/main/java/org.onosproject.xran/entities/RnibCell.java
diff --git a/src/main/java/org.onosproject.xran/entities/RnibLink.java b/apps/xran/src/main/java/org.onosproject.xran/entities/RnibLink.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/entities/RnibLink.java
rename to apps/xran/src/main/java/org.onosproject.xran/entities/RnibLink.java
diff --git a/src/main/java/org.onosproject.xran/entities/RnibSlice.java b/apps/xran/src/main/java/org.onosproject.xran/entities/RnibSlice.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/entities/RnibSlice.java
rename to apps/xran/src/main/java/org.onosproject.xran/entities/RnibSlice.java
diff --git a/src/main/java/org.onosproject.xran/entities/RnibUe.java b/apps/xran/src/main/java/org.onosproject.xran/entities/RnibUe.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/entities/RnibUe.java
rename to apps/xran/src/main/java/org.onosproject.xran/entities/RnibUe.java
diff --git a/src/main/java/org.onosproject.xran/entities/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/entities/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/entities/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/entities/package-info.java
diff --git a/src/main/java/org.onosproject.xran/identifiers/ContextUpdateHandler.java b/apps/xran/src/main/java/org.onosproject.xran/identifiers/ContextUpdateHandler.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/identifiers/ContextUpdateHandler.java
rename to apps/xran/src/main/java/org.onosproject.xran/identifiers/ContextUpdateHandler.java
diff --git a/src/main/java/org.onosproject.xran/identifiers/EcgiCrntiPair.java b/apps/xran/src/main/java/org.onosproject.xran/identifiers/EcgiCrntiPair.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/identifiers/EcgiCrntiPair.java
rename to apps/xran/src/main/java/org.onosproject.xran/identifiers/EcgiCrntiPair.java
diff --git a/src/main/java/org.onosproject.xran/identifiers/LinkId.java b/apps/xran/src/main/java/org.onosproject.xran/identifiers/LinkId.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/identifiers/LinkId.java
rename to apps/xran/src/main/java/org.onosproject.xran/identifiers/LinkId.java
diff --git a/src/main/java/org.onosproject.xran/identifiers/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/identifiers/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/identifiers/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/identifiers/package-info.java
diff --git a/src/main/java/org.onosproject.xran/impl/DefaultXranStore.java b/apps/xran/src/main/java/org.onosproject.xran/impl/DefaultXranStore.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/impl/DefaultXranStore.java
rename to apps/xran/src/main/java/org.onosproject.xran/impl/DefaultXranStore.java
diff --git a/src/main/java/org.onosproject.xran/impl/DistributedXranStore.java b/apps/xran/src/main/java/org.onosproject.xran/impl/DistributedXranStore.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/impl/DistributedXranStore.java
rename to apps/xran/src/main/java/org.onosproject.xran/impl/DistributedXranStore.java
diff --git a/src/main/java/org.onosproject.xran/impl/XranConfig.java b/apps/xran/src/main/java/org.onosproject.xran/impl/XranConfig.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/impl/XranConfig.java
rename to apps/xran/src/main/java/org.onosproject.xran/impl/XranConfig.java
diff --git a/src/main/java/org.onosproject.xran/impl/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/impl/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/impl/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/impl/package-info.java
diff --git a/src/main/java/org.onosproject.xran/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/package-info.java
diff --git a/src/main/java/org.onosproject.xran/providers/CellDeviceProvider.java b/apps/xran/src/main/java/org.onosproject.xran/providers/CellDeviceProvider.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/providers/CellDeviceProvider.java
rename to apps/xran/src/main/java/org.onosproject.xran/providers/CellDeviceProvider.java
diff --git a/src/main/java/org.onosproject.xran/providers/UeProvider.java b/apps/xran/src/main/java/org.onosproject.xran/providers/UeProvider.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/providers/UeProvider.java
rename to apps/xran/src/main/java/org.onosproject.xran/providers/UeProvider.java
diff --git a/src/main/java/org.onosproject.xran/providers/XranDeviceListener.java b/apps/xran/src/main/java/org.onosproject.xran/providers/XranDeviceListener.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/providers/XranDeviceListener.java
rename to apps/xran/src/main/java/org.onosproject.xran/providers/XranDeviceListener.java
diff --git a/src/main/java/org.onosproject.xran/providers/XranHostListener.java b/apps/xran/src/main/java/org.onosproject.xran/providers/XranHostListener.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/providers/XranHostListener.java
rename to apps/xran/src/main/java/org.onosproject.xran/providers/XranHostListener.java
diff --git a/src/main/java/org.onosproject.xran/providers/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/providers/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/providers/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/providers/package-info.java
diff --git a/src/main/java/org.onosproject.xran/rest/CellWebResource.java b/apps/xran/src/main/java/org.onosproject.xran/rest/CellWebResource.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/rest/CellWebResource.java
rename to apps/xran/src/main/java/org.onosproject.xran/rest/CellWebResource.java
diff --git a/src/main/java/org.onosproject.xran/rest/LinkWebResource.java b/apps/xran/src/main/java/org.onosproject.xran/rest/LinkWebResource.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/rest/LinkWebResource.java
rename to apps/xran/src/main/java/org.onosproject.xran/rest/LinkWebResource.java
diff --git a/src/main/java/org.onosproject.xran/rest/NodeWebResource.java b/apps/xran/src/main/java/org.onosproject.xran/rest/NodeWebResource.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/rest/NodeWebResource.java
rename to apps/xran/src/main/java/org.onosproject.xran/rest/NodeWebResource.java
diff --git a/src/main/java/org.onosproject.xran/rest/ResponseHelper.java b/apps/xran/src/main/java/org.onosproject.xran/rest/ResponseHelper.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/rest/ResponseHelper.java
rename to apps/xran/src/main/java/org.onosproject.xran/rest/ResponseHelper.java
diff --git a/src/main/java/org.onosproject.xran/rest/SliceWebResource.java b/apps/xran/src/main/java/org.onosproject.xran/rest/SliceWebResource.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/rest/SliceWebResource.java
rename to apps/xran/src/main/java/org.onosproject.xran/rest/SliceWebResource.java
diff --git a/src/main/java/org.onosproject.xran/rest/XranWebApplication.java b/apps/xran/src/main/java/org.onosproject.xran/rest/XranWebApplication.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/rest/XranWebApplication.java
rename to apps/xran/src/main/java/org.onosproject.xran/rest/XranWebApplication.java
diff --git a/src/main/java/org.onosproject.xran/rest/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/rest/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/rest/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/rest/package-info.java
diff --git a/src/main/java/org.onosproject.xran/wrapper/CellMap.java b/apps/xran/src/main/java/org.onosproject.xran/wrapper/CellMap.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/wrapper/CellMap.java
rename to apps/xran/src/main/java/org.onosproject.xran/wrapper/CellMap.java
diff --git a/src/main/java/org.onosproject.xran/wrapper/LinkMap.java b/apps/xran/src/main/java/org.onosproject.xran/wrapper/LinkMap.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/wrapper/LinkMap.java
rename to apps/xran/src/main/java/org.onosproject.xran/wrapper/LinkMap.java
diff --git a/src/main/java/org.onosproject.xran/wrapper/UeMap.java b/apps/xran/src/main/java/org.onosproject.xran/wrapper/UeMap.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/wrapper/UeMap.java
rename to apps/xran/src/main/java/org.onosproject.xran/wrapper/UeMap.java
diff --git a/src/main/java/org.onosproject.xran/wrapper/package-info.java b/apps/xran/src/main/java/org.onosproject.xran/wrapper/package-info.java
similarity index 100%
rename from src/main/java/org.onosproject.xran/wrapper/package-info.java
rename to apps/xran/src/main/java/org.onosproject.xran/wrapper/package-info.java
diff --git a/src/main/webapp/WEB-INF/web.xml b/apps/xran/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/web.xml
rename to apps/xran/src/main/webapp/WEB-INF/web.xml
diff --git a/xran-cfg.json b/apps/xran/xran-cfg.json
similarity index 100%
rename from xran-cfg.json
rename to apps/xran/xran-cfg.json