diff --git a/tools/chakana/CYGWIN_USERS.txt b/backyard/tools/chakana/CYGWIN_USERS.txt
similarity index 100%
rename from tools/chakana/CYGWIN_USERS.txt
rename to backyard/tools/chakana/CYGWIN_USERS.txt
diff --git a/tools/chakana/__init__.py b/backyard/tools/chakana/__init__.py
similarity index 100%
rename from tools/chakana/__init__.py
rename to backyard/tools/chakana/__init__.py
diff --git a/tools/chakana/build.xml b/backyard/tools/chakana/build.xml
similarity index 100%
rename from tools/chakana/build.xml
rename to backyard/tools/chakana/build.xml
diff --git a/tools/chakana/command.py b/backyard/tools/chakana/command.py
similarity index 98%
rename from tools/chakana/command.py
rename to backyard/tools/chakana/command.py
index 1ee9b60a2..494067496 100644
--- a/tools/chakana/command.py
+++ b/backyard/tools/chakana/command.py
@@ -7,7 +7,7 @@
 #  Written and maintained by Lars Albertsson <lalle@sics.se>.
 #  
 
-# $Id: command.py,v 1.1 2007/08/21 14:41:01 fros4943 Exp $
+# $Id: command.py,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
 
 """Utility routines for running external commands."""
 
diff --git a/tools/chakana/cooja.chakana.properties b/backyard/tools/chakana/cooja.chakana.properties
similarity index 100%
rename from tools/chakana/cooja.chakana.properties
rename to backyard/tools/chakana/cooja.chakana.properties
diff --git a/tools/chakana/cooja_plugin/README b/backyard/tools/chakana/cooja_plugin/README
similarity index 100%
rename from tools/chakana/cooja_plugin/README
rename to backyard/tools/chakana/cooja_plugin/README
diff --git a/tools/chakana/cooja_plugin/build.xml b/backyard/tools/chakana/cooja_plugin/build.xml
similarity index 100%
rename from tools/chakana/cooja_plugin/build.xml
rename to backyard/tools/chakana/cooja_plugin/build.xml
diff --git a/tools/chakana/cooja_plugin/cooja.config b/backyard/tools/chakana/cooja_plugin/cooja.config
similarity index 100%
rename from tools/chakana/cooja_plugin/cooja.config
rename to backyard/tools/chakana/cooja_plugin/cooja.config
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/ChakanaPlugin.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/ChakanaPlugin.java
similarity index 99%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/ChakanaPlugin.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/ChakanaPlugin.java
index 38d4867cc..9b51cde26 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/ChakanaPlugin.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/ChakanaPlugin.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: ChakanaPlugin.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: ChakanaPlugin.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/EventpointEvaluator.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/EventpointEvaluator.java
similarity index 98%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/EventpointEvaluator.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/EventpointEvaluator.java
index f3e63c753..1bcb7e386 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/EventpointEvaluator.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/EventpointEvaluator.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: EventpointEvaluator.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: EventpointEvaluator.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/XMLCommandHandler.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/XMLCommandHandler.java
similarity index 99%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/XMLCommandHandler.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/XMLCommandHandler.java
index 6ce2a1cf5..031a35cdd 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/XMLCommandHandler.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/XMLCommandHandler.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: XMLCommandHandler.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: XMLCommandHandler.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Eventpoint.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Eventpoint.java
similarity index 96%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Eventpoint.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Eventpoint.java
index d990fe3aa..bbca9d7db 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Eventpoint.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Eventpoint.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: Eventpoint.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: Eventpoint.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana.eventpoints;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/IntegerWatchpoint.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/IntegerWatchpoint.java
similarity index 96%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/IntegerWatchpoint.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/IntegerWatchpoint.java
index 12cd4956f..a615ce2d1 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/IntegerWatchpoint.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/IntegerWatchpoint.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: IntegerWatchpoint.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: IntegerWatchpoint.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana.eventpoints;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RadioMediumEventpoint.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RadioMediumEventpoint.java
similarity index 97%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RadioMediumEventpoint.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RadioMediumEventpoint.java
index dc303b951..2053c8cae 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RadioMediumEventpoint.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RadioMediumEventpoint.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: RadioMediumEventpoint.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: RadioMediumEventpoint.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana.eventpoints;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RealTimepoint.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RealTimepoint.java
similarity index 97%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RealTimepoint.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RealTimepoint.java
index 54981ac02..501ea193c 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RealTimepoint.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/RealTimepoint.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: RealTimepoint.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: RealTimepoint.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana.eventpoints;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/SimulationTimepoint.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/SimulationTimepoint.java
similarity index 97%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/SimulationTimepoint.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/SimulationTimepoint.java
index 05865432f..0fb4f520a 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/SimulationTimepoint.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/SimulationTimepoint.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: SimulationTimepoint.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: SimulationTimepoint.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana.eventpoints;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Timepoint.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Timepoint.java
similarity index 96%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Timepoint.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Timepoint.java
index a7be67fe7..da1740c6d 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Timepoint.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Timepoint.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: Timepoint.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: Timepoint.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana.eventpoints;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/TransmissionRadioMediumEventpoint.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/TransmissionRadioMediumEventpoint.java
similarity index 96%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/TransmissionRadioMediumEventpoint.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/TransmissionRadioMediumEventpoint.java
index b3b7b6195..b45f5132f 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/TransmissionRadioMediumEventpoint.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/TransmissionRadioMediumEventpoint.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: TransmissionRadioMediumEventpoint.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: TransmissionRadioMediumEventpoint.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana.eventpoints;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/VariableWatchpoint.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/VariableWatchpoint.java
similarity index 97%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/VariableWatchpoint.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/VariableWatchpoint.java
index da063760e..5bd081cdb 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/VariableWatchpoint.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/VariableWatchpoint.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: VariableWatchpoint.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: VariableWatchpoint.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana.eventpoints;
diff --git a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Watchpoint.java b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Watchpoint.java
similarity index 97%
rename from tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Watchpoint.java
rename to backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Watchpoint.java
index b357c2b2b..a9893abf7 100644
--- a/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Watchpoint.java
+++ b/backyard/tools/chakana/cooja_plugin/java/se/sics/chakana/eventpoints/Watchpoint.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: Watchpoint.java,v 1.1 2007/08/21 14:39:58 fros4943 Exp $
+ * $Id: Watchpoint.java,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
  */
 
 package se.sics.chakana.eventpoints;
diff --git a/tools/chakana/debug.py b/backyard/tools/chakana/debug.py
similarity index 99%
rename from tools/chakana/debug.py
rename to backyard/tools/chakana/debug.py
index 9fcdd0588..69f476ee1 100644
--- a/tools/chakana/debug.py
+++ b/backyard/tools/chakana/debug.py
@@ -5,7 +5,7 @@
 # file for licensing information.
 #  
 
-# $Id: debug.py,v 1.1 2007/08/21 14:41:01 fros4943 Exp $
+# $Id: debug.py,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
 
 import inspect
 import os
diff --git a/tools/chakana/error.py b/backyard/tools/chakana/error.py
similarity index 97%
rename from tools/chakana/error.py
rename to backyard/tools/chakana/error.py
index 03c7ced17..10879419f 100644
--- a/tools/chakana/error.py
+++ b/backyard/tools/chakana/error.py
@@ -5,7 +5,7 @@
 # file for licensing information.
 #  
 
-# $Id: error.py,v 1.1 2007/08/21 14:41:01 fros4943 Exp $
+# $Id: error.py,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
 
 import errno
 import os
diff --git a/tools/chakana/event.py b/backyard/tools/chakana/event.py
similarity index 100%
rename from tools/chakana/event.py
rename to backyard/tools/chakana/event.py
diff --git a/tools/chakana/harness.py b/backyard/tools/chakana/harness.py
similarity index 100%
rename from tools/chakana/harness.py
rename to backyard/tools/chakana/harness.py
diff --git a/tools/chakana/linux.py b/backyard/tools/chakana/linux.py
similarity index 99%
rename from tools/chakana/linux.py
rename to backyard/tools/chakana/linux.py
index 087eb5c49..7190ec9bf 100644
--- a/tools/chakana/linux.py
+++ b/backyard/tools/chakana/linux.py
@@ -6,7 +6,7 @@
 #  
 
 
-# $Id: linux.py,v 1.1 2007/08/21 14:41:01 fros4943 Exp $
+# $Id: linux.py,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
 
 import errno
 import glob
diff --git a/tools/chakana/monitor.py b/backyard/tools/chakana/monitor.py
similarity index 100%
rename from tools/chakana/monitor.py
rename to backyard/tools/chakana/monitor.py
diff --git a/tools/chakana/shepherd.py b/backyard/tools/chakana/shepherd.py
similarity index 100%
rename from tools/chakana/shepherd.py
rename to backyard/tools/chakana/shepherd.py
diff --git a/tools/chakana/test_template/run_test.py b/backyard/tools/chakana/test_template/run_test.py
similarity index 100%
rename from tools/chakana/test_template/run_test.py
rename to backyard/tools/chakana/test_template/run_test.py
diff --git a/tools/chakana/test_template/simple_simulation.csc b/backyard/tools/chakana/test_template/simple_simulation.csc
similarity index 100%
rename from tools/chakana/test_template/simple_simulation.csc
rename to backyard/tools/chakana/test_template/simple_simulation.csc
diff --git a/tools/chakana/threads.py b/backyard/tools/chakana/threads.py
similarity index 99%
rename from tools/chakana/threads.py
rename to backyard/tools/chakana/threads.py
index 4f102d3f7..428cc52ff 100644
--- a/tools/chakana/threads.py
+++ b/backyard/tools/chakana/threads.py
@@ -7,7 +7,7 @@
 #  Written and maintained by Lars Albertsson <lalle@sics.se>.
 #  
 
-# $Id: threads.py,v 1.1 2007/08/21 14:41:01 fros4943 Exp $
+# $Id: threads.py,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
 
 import signal
 import sys
diff --git a/tools/chakana/utils.py b/backyard/tools/chakana/utils.py
similarity index 99%
rename from tools/chakana/utils.py
rename to backyard/tools/chakana/utils.py
index bc8a433c4..668685af6 100644
--- a/tools/chakana/utils.py
+++ b/backyard/tools/chakana/utils.py
@@ -6,7 +6,7 @@
 #  
 
 
-# $Id: utils.py,v 1.1 2007/08/21 14:41:01 fros4943 Exp $
+# $Id: utils.py,v 1.1 2009/02/26 13:47:38 fros4943 Exp $
 
 import errno
 import math