Reorganizing ODTN app structure

- separated code which could be referenced from drivers

Change-Id: Ic2c0ae0507abc626771dfaf7a8fc18b5a715cc30
diff --git a/drivers/odtn-driver/BUCK b/drivers/odtn-driver/BUCK
index 9078939..d62183e 100644
--- a/drivers/odtn-driver/BUCK
+++ b/drivers/odtn-driver/BUCK
@@ -2,7 +2,7 @@
     '//lib:CORE_DEPS',
     '//protocols/netconf/api:onos-protocols-netconf-api',
     '//lib:commons-jxpath',
-    '//apps/odtn:onos-apps-odtn', # FIXME direction of dependency not ideal
+    '//apps/odtn/api:onos-apps-odtn-api',
 ]
 
 TEST_DEPS = [
@@ -34,6 +34,6 @@
     included_bundles = BUNDLES,
     required_apps = [
         'org.onosproject.netconf',
-        'org.onosproject.odtn',
+        'org.onosproject.odtn-api',
     ],
 )
diff --git a/drivers/odtn-driver/pom.xml b/drivers/odtn-driver/pom.xml
index 0f93c09..6f1df76 100644
--- a/drivers/odtn-driver/pom.xml
+++ b/drivers/odtn-driver/pom.xml
@@ -33,10 +33,9 @@
 
     <dependencies>
 
-        <!-- FIXME direction of dependency not ideal -->
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-apps-odtn</artifactId>
+            <artifactId>onos-apps-odtn-api</artifactId>
             <version>${project.version}</version>
         </dependency>