diff --git a/pom.xml b/pom.xml
index 9810bee..46f11b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,23 +29,18 @@
     <groupId>org.opencord</groupId>
     <artifactId>aaa</artifactId>
     <version>1.9.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <description>ONOS authentication application</description>
+    <packaging>pom</packaging>
 
     <properties>
-        <onos.app.name>org.opencord.aaa</onos.app.name>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <onos.version>1.13.9-rc4</onos.version>
-        <onos.app.title>AAA App</onos.app.title>
-        <onos.app.category>Security</onos.app.category>
-        <onos.app.url>http://opencord.org</onos.app.url>
-        <onos.app.readme>802.1x authentication service.</onos.app.readme>
-        <onos.app.requires>
-              org.opencord.sadis
-        </onos.app.requires>
-        <sadis.api.version>3.1.0-SNAPSHOT</sadis.api.version>
     </properties>
 
+    <modules>
+        <module>app</module>
+        <module>api</module>
+    </modules>
+
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
@@ -54,12 +49,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opencord</groupId>
-            <artifactId>sadis-api</artifactId>
-	    <version>${sadis.api.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
             <version>${onos.version}</version>
@@ -92,26 +81,6 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.onosproject</groupId>
-                <artifactId>onos-maven-plugin</artifactId>
-                <version>1.11</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <repositories>
         <repository>
             <id>central</id>