diff --git a/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulatorEncounterFormationCore.java b/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulatorEncounterFormationCore.java
index 975829c58bd60aacf88f56e95515e0fc490f9b77..d804a62d0f24fcacff02542921d67501e2c81a45 100644
--- a/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulatorEncounterFormationCore.java
+++ b/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulatorEncounterFormationCore.java
@@ -39,10 +39,10 @@ public class SimulatorEncounterFormationCore implements Runnable {
     protected static List<Identifier> mDHPubKeys = new ArrayList<>(NUM_SIMULATED_EPOCHS);
     protected static List<Identifier> mDHNonces = new ArrayList<>(NUM_SIMULATED_EPOCHS);
     protected static List<Identifier> mDHFullKeys = new ArrayList<>(NUM_SIMULATED_EPOCHS);
-    protected static List<Identifier> otherDHPubKeys = new ArrayList<>(NUM_SIMULATED_DEVICES*NUM_SIMULATED_EPOCHS);
-    protected static List<Identifier> otherDHNonces = new ArrayList<>(NUM_SIMULATED_DEVICES*NUM_SIMULATED_EPOCHS);
+    public static List<Identifier> otherDHPubKeys = new ArrayList<>(NUM_SIMULATED_DEVICES*NUM_SIMULATED_EPOCHS);
+    public static List<Identifier> otherDHNonces = new ArrayList<>(NUM_SIMULATED_DEVICES*NUM_SIMULATED_EPOCHS);
     protected static List<Identifier> otherDHFullKeys = new ArrayList<>(NUM_SIMULATED_DEVICES*NUM_SIMULATED_EPOCHS);
-    protected static List<Identifier> mSharedSecrets = new ArrayList<>(NUM_SIMULATED_DEVICES*NUM_SIMULATED_EPOCHS);
+    public static List<Identifier> mSharedSecrets = new ArrayList<>(NUM_SIMULATED_DEVICES*NUM_SIMULATED_EPOCHS);
     protected static int CURRENT_EPOCH = 0;
 
     protected static Identifier mDHPubKey;
diff --git a/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulationClient.java b/testapp/src/main/java/org/mpisws/testapp/SimulationClient.java
similarity index 99%
rename from ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulationClient.java
rename to testapp/src/main/java/org/mpisws/testapp/SimulationClient.java
index 21246feeda3583bde6ebcbcd8cf9098a666af79b..217db6991f4c49d20fa0a9a0e74dc227267a11d9 100644
--- a/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulationClient.java
+++ b/testapp/src/main/java/org/mpisws/testapp/SimulationClient.java
@@ -1,4 +1,4 @@
-package org.mpisws.encounters.encounterformation.simulator;
+package org.mpisws.testapp;
 
 import android.content.Context;
 import android.net.nsd.NsdManager;