diff --git a/tools/package/etc/org.onosproject.fwd.ReactiveForwarding.cfg b/tools/package/etc/samples/org.onosproject.fwd.ReactiveForwarding.cfg
similarity index 95%
rename from tools/package/etc/org.onosproject.fwd.ReactiveForwarding.cfg
rename to tools/package/etc/samples/org.onosproject.fwd.ReactiveForwarding.cfg
index 923eeeb..4befc70 100644
--- a/tools/package/etc/org.onosproject.fwd.ReactiveForwarding.cfg
+++ b/tools/package/etc/samples/org.onosproject.fwd.ReactiveForwarding.cfg
@@ -1,6 +1,6 @@
 #
 # Sample configuration for onos-app-fwd.
-# This configuration file would be placed at: $(KARAF_ROOT)/etc.
+#
 
 #
 # Reactive flows default matching is InPort, Src MAC, Dst MAC and EtherType fields 
diff --git a/tools/package/etc/org.onosproject.provider.host.impl.HostLocationProvider.cfg b/tools/package/etc/samples/org.onosproject.provider.host.impl.HostLocationProvider.cfg
similarity index 78%
rename from tools/package/etc/org.onosproject.provider.host.impl.HostLocationProvider.cfg
rename to tools/package/etc/samples/org.onosproject.provider.host.impl.HostLocationProvider.cfg
index 248998a..952f8ce 100644
--- a/tools/package/etc/org.onosproject.provider.host.impl.HostLocationProvider.cfg
+++ b/tools/package/etc/samples/org.onosproject.provider.host.impl.HostLocationProvider.cfg
@@ -1,6 +1,6 @@
 #
 # Sample configuration for Host Location Provider
-# This configuration file would be placed at: $(KARAF_ROOT)/etc.
+#
 
 #
 # Enable host removal on port/device down events.
diff --git a/tools/package/etc/org.onosproject.provider.lldp.impl.LLDPLinkProvider.cfg b/tools/package/etc/samples/org.onosproject.provider.lldp.impl.LLDPLinkProvider.cfg
similarity index 69%
rename from tools/package/etc/org.onosproject.provider.lldp.impl.LLDPLinkProvider.cfg
rename to tools/package/etc/samples/org.onosproject.provider.lldp.impl.LLDPLinkProvider.cfg
index 12f126b..6eb39a1 100644
--- a/tools/package/etc/org.onosproject.provider.lldp.impl.LLDPLinkProvider.cfg
+++ b/tools/package/etc/samples/org.onosproject.provider.lldp.impl.LLDPLinkProvider.cfg
@@ -1,6 +1,6 @@
+#
 # Sample configuration for link discovery
-# Note that the current file location (onos/tools/package/etc) is required for packaging onos and launching it in another location.
-# If you are launching onos locally, this configuration file would be placed at: $(KARAF_ROOT)/etc
+#
 
 #
 # Disable Link Dicovery Permanently (Note: changing this property at runtime will have NO effect)
diff --git a/tools/package/etc/org.onosproject.provider.nil.device.impl.NullDeviceProvider.cfg b/tools/package/etc/samples/org.onosproject.provider.nil.device.impl.NullDeviceProvider.cfg
similarity index 100%
rename from tools/package/etc/org.onosproject.provider.nil.device.impl.NullDeviceProvider.cfg
rename to tools/package/etc/samples/org.onosproject.provider.nil.device.impl.NullDeviceProvider.cfg
diff --git a/tools/package/etc/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg b/tools/package/etc/samples/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg
similarity index 98%
rename from tools/package/etc/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg
rename to tools/package/etc/samples/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg
index cfbe36b..dd8d323 100644
--- a/tools/package/etc/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg
+++ b/tools/package/etc/samples/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg
@@ -1,4 +1,6 @@
+#
 # Sample configurations for the NullLinkProvider.
+#
 
 #
 # If enabled, sets the time between LinkEvent generation,
diff --git a/tools/package/etc/org.onosproject.provider.nil.packet.impl.NullPacketProvider.cfg b/tools/package/etc/samples/org.onosproject.provider.nil.packet.impl.NullPacketProvider.cfg
similarity index 100%
rename from tools/package/etc/org.onosproject.provider.nil.packet.impl.NullPacketProvider.cfg
rename to tools/package/etc/samples/org.onosproject.provider.nil.packet.impl.NullPacketProvider.cfg
diff --git a/tools/package/etc/org.onosproject.proxyarp.ProxyArp.cfg b/tools/package/etc/samples/org.onosproject.proxyarp.ProxyArp.cfg
similarity index 64%
rename from tools/package/etc/org.onosproject.proxyarp.ProxyArp.cfg
rename to tools/package/etc/samples/org.onosproject.proxyarp.ProxyArp.cfg
index f736697..4746c5b 100644
--- a/tools/package/etc/org.onosproject.proxyarp.ProxyArp.cfg
+++ b/tools/package/etc/samples/org.onosproject.proxyarp.ProxyArp.cfg
@@ -1,6 +1,6 @@
 #
 # Sample configuration for onos-app-proxyarp.
-# This configuration file would be placed at: $(KARAF_ROOT)/etc.
+#
 
 #
 # Enable IPv6 Neighbor Discovery.