20 files changed, 26 insertions, 26 deletions
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/ChannelContext.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/ChannelContext.kt
index aaf5abba..dee55730 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/ChannelContext.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/ChannelContext.kt
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel
+package nl.atlarge.opendc.simulator
 
-import nl.atlarge.opendc.kernel.messaging.Writable
+import nl.atlarge.opendc.simulator.messaging.Writable
 import nl.atlarge.opendc.topology.Edge
 
 /**
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/Context.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/Context.kt
index 37d21d60..61ba8192 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/Context.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/Context.kt
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel
+package nl.atlarge.opendc.simulator
 
-import nl.atlarge.opendc.kernel.messaging.Readable
+import nl.atlarge.opendc.simulator.messaging.Readable
 import nl.atlarge.opendc.topology.Component
 import nl.atlarge.opendc.topology.Entity
 import nl.atlarge.opendc.topology.Topology
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/DefaultSimulator.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/DefaultSimulator.kt
index a3d978e4..6f025ed1 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/DefaultSimulator.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/DefaultSimulator.kt
@@ -22,12 +22,12 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel
+package nl.atlarge.opendc.simulator
 
 import mu.KotlinLogging
-import nl.atlarge.opendc.kernel.clock.Clock
-import nl.atlarge.opendc.kernel.clock.Tick
-import nl.atlarge.opendc.kernel.messaging.Envelope
+import nl.atlarge.opendc.simulator.clock.Clock
+import nl.atlarge.opendc.simulator.clock.Tick
+import nl.atlarge.opendc.simulator.messaging.Envelope
 import nl.atlarge.opendc.topology.*
 import java.util.*
 import kotlin.coroutines.experimental.*
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/EntityContext.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/EntityContext.kt
index ea9c6b04..3cbbea71 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/EntityContext.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/EntityContext.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel
+package nl.atlarge.opendc.simulator
 
 import nl.atlarge.opendc.topology.Entity
 import nl.atlarge.opendc.topology.Node
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/Kernel.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/Kernel.kt
index 4a289580..0e0a62a6 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/Kernel.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/Kernel.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel
+package nl.atlarge.opendc.simulator
 
 import nl.atlarge.opendc.topology.Component
 
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/Simulator.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/Simulator.kt
index f336bf1b..23bf6818 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/Simulator.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/Simulator.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel
+package nl.atlarge.opendc.simulator
 
 import nl.atlarge.opendc.topology.Topology
 
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/clock/Clock.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/clock/Clock.kt
index db13eee1..07377e4a 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/clock/Clock.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/clock/Clock.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.clock
+package nl.atlarge.opendc.simulator.clock
 
 /**
  * A tick represents a moment of time in which some work is done by an entity.
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Channel.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Channel.kt
index ad966719..35407897 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Channel.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Channel.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 import nl.atlarge.opendc.topology.Edge
 import nl.atlarge.opendc.topology.Node
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/DuplexChannel.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/DuplexChannel.kt
index a4ef7409..942f56c8 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/DuplexChannel.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/DuplexChannel.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 /**
  * A [DuplexChannel] instance allows bi-directional communication over the channel.
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/DuplexPort.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/DuplexPort.kt
index 5917ac71..bc67ae65 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/DuplexPort.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/DuplexPort.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 /**
  * A [DuplexPort] instance allows bi-directional communication with multiple channels.
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Envelope.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Envelope.kt
index d4d363d5..2c09fe8a 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Envelope.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Envelope.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 import nl.atlarge.opendc.topology.Node
 
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Port.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Port.kt
index 18ec1918..a7d7caba 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Port.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Port.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 /**
  * A port connects multiple [Channel]s to an entity in the topology of a cloud network.
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Readable.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Readable.kt
index 422c5668..161bcbd8 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Readable.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Readable.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 /**
  * A [Readable] instance allows objects to pull messages from the instance.
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/ReadableChannel.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/ReadableChannel.kt
index c291b1ea..6bbc3b7d 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/ReadableChannel.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/ReadableChannel.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 /**
  * A [ReadableChannel] instance allows objects to receive messages from the channel.
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/ReadablePort.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/ReadablePort.kt
index bfad9490..a8ad6e16 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/ReadablePort.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/ReadablePort.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 /**
  * A [ReadablePort] instance allows objects to receive messages from the channel.
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Writable.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Writable.kt
index 6bd1ce30..c8b354b1 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/Writable.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/Writable.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 import nl.atlarge.opendc.topology.Node
 
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/WritableChannel.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/WritableChannel.kt
index 60f89a97..fcfbd5b4 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/WritableChannel.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/WritableChannel.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 /**
  * A [WritableChannel] instance allows objects to write messages to the channel.
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/WritablePort.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/WritablePort.kt
index 0dc92680..a475709a 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/kernel/messaging/WritablePort.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/simulator/messaging/WritablePort.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package nl.atlarge.opendc.kernel.messaging
+package nl.atlarge.opendc.simulator.messaging
 
 /**
  * A [WritablePort] instance allows objects to write messages to multiple channels.
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/machine/Machine.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/machine/Machine.kt
index 049f82b8..95594e27 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/machine/Machine.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/machine/Machine.kt
@@ -25,8 +25,8 @@
 package nl.atlarge.opendc.topology.machine
 
 import nl.atlarge.opendc.experiment.Task
-import nl.atlarge.opendc.kernel.EntityContext
-import nl.atlarge.opendc.kernel.Kernel
+import nl.atlarge.opendc.simulator.EntityContext
+import nl.atlarge.opendc.simulator.Kernel
 import nl.atlarge.opendc.topology.Entity
 import nl.atlarge.opendc.topology.outgoing
 import java.util.*
diff --git a/opendc-core/src/test/kotlin/nl/atlarge/opendc/SmokeTest.kt b/opendc-core/src/test/kotlin/nl/atlarge/opendc/SmokeTest.kt
index 3af0f8f3..f56a13e6 100644
--- a/opendc-core/src/test/kotlin/nl/atlarge/opendc/SmokeTest.kt
+++ b/opendc-core/src/test/kotlin/nl/atlarge/opendc/SmokeTest.kt
@@ -24,7 +24,7 @@
 
 package nl.atlarge.opendc
 
-import nl.atlarge.opendc.kernel.DefaultSimulator
+import nl.atlarge.opendc.simulator.DefaultSimulator
 import nl.atlarge.opendc.topology.AdjacencyListTopologyBuilder
 import nl.atlarge.opendc.topology.container.Rack
 import nl.atlarge.opendc.topology.machine.Cpu