diff --git a/core/api/src/main/java/org/onosproject/net/flow/package-info.java b/core/api/src/main/java/org/onosproject/net/flow/package-info.java
index 4264ee9..e17da4d 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/package-info.java
@@ -16,5 +16,11 @@
 
 /**
  * Flow rule model &amp; related services API definitions.
+ *
+ * <p>
+ * The figure below depicts the general interactions between different
+ * components of the intent subsystem.<br>
+ * <img src="doc-files/flowrule-design.png" alt="ONOS flow rule subsystem design">
+ * </p>
  */
 package org.onosproject.net.flow;
diff --git a/core/api/src/main/java/org/onosproject/net/group/package-info.java b/core/api/src/main/java/org/onosproject/net/group/package-info.java
new file mode 100644
index 0000000..26528c4
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/net/group/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+/**
+ * Abstractions for interacting with device port groups.
+ */
+package org.onosproject.net.group;
\ No newline at end of file
diff --git a/core/api/src/main/java/org/onosproject/net/intent/package-info.java b/core/api/src/main/java/org/onosproject/net/intent/package-info.java
index 601d976..5aad747 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/package-info.java
@@ -75,7 +75,9 @@
  * performs global recomputation/optimization across all prior intents.
  * </p>
  * <p>
- * <img src="doc-files/intent-subsystem.png" alt="ONOS intent subsystem">
+ * The figure below depicts the general interactions between different
+ * components of the intent subsystem.<br>
+ * <img src="doc-files/intent-design.png" alt="ONOS intent subsystem design">
  * </p>
  */
 package org.onosproject.net.intent;
diff --git a/core/api/src/main/javadoc/org/onosproject/net/flow/doc-files/flowrule-design.png b/core/api/src/main/javadoc/org/onosproject/net/flow/doc-files/flowrule-design.png
new file mode 100644
index 0000000..4392ad4
--- /dev/null
+++ b/core/api/src/main/javadoc/org/onosproject/net/flow/doc-files/flowrule-design.png
Binary files differ
diff --git a/core/api/src/main/javadoc/org/onosproject/net/intent/doc-files/intent-design.png b/core/api/src/main/javadoc/org/onosproject/net/intent/doc-files/intent-design.png
new file mode 100644
index 0000000..e08745d
--- /dev/null
+++ b/core/api/src/main/javadoc/org/onosproject/net/intent/doc-files/intent-design.png
Binary files differ
diff --git a/core/api/src/main/javadoc/org/onosproject/net/intent/doc-files/intent-subsystem.png b/core/api/src/main/javadoc/org/onosproject/net/intent/doc-files/intent-subsystem.png
deleted file mode 100644
index 616b2f8..0000000
--- a/core/api/src/main/javadoc/org/onosproject/net/intent/doc-files/intent-subsystem.png
+++ /dev/null
Binary files differ