Renamed datagrid and datastore packages

net.onrc.onos.datagrid.* => net.onrc.onos.core.datagrid.*
net.onrc.onos.datastore.* => net.onrc.onos.core.datastore.*

Change-Id: Ibe1894a6fabae08ea7cfcbf6595f0c91b05ef497
diff --git a/conf/findbugs/exclude.xml b/conf/findbugs/exclude.xml
index 7fe430a..ce20793 100644
--- a/conf/findbugs/exclude.xml
+++ b/conf/findbugs/exclude.xml
@@ -7,7 +7,7 @@
           (under build and reporting)
      -->
      <Match>
-       <Class name="~net.onrc.onos.datastore.RCProtos(.*)?" />
+       <Class name="~net.onrc.onos.core.datastore.RCProtos(.*)?" />
      </Match>
      <Match>
        <Class name="~.*edu\.stanford\..*"/>
diff --git a/conf/onos.properties b/conf/onos.properties
index 953ab78..129551b 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -1,7 +1,7 @@
 floodlight.modules = net.floodlightcontroller.core.FloodlightProvider,\
 net.floodlightcontroller.threadpool.ThreadPool,\
 net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher, \
-net.onrc.onos.datagrid.HazelcastDatagrid,\
+net.onrc.onos.core.datagrid.HazelcastDatagrid,\
 net.onrc.onos.ofcontroller.flowprogrammer.FlowProgrammer,\
 net.onrc.onos.intent.runtime.PathCalcRuntimeModule,\
 net.onrc.onos.intent.runtime.PlanInstallModule,\
@@ -11,4 +11,4 @@
 net.floodlightcontroller.core.FloodlightProvider.workerthreads = 16
 net.floodlightcontroller.forwarding.Forwarding.idletimeout = 5
 net.floodlightcontroller.forwarding.Forwarding.hardtimeout = 0
-net.onrc.onos.datagrid.HazelcastDatagrid.datagridConfig = conf/hazelcast.xml
+net.onrc.onos.core.datagrid.HazelcastDatagrid.datagridConfig = conf/hazelcast.xml