diff --git a/tests/simulator/bots.py b/tests/simulator/bots.py
deleted file mode 100644
index 68bc4e16..00000000
--- a/tests/simulator/bots.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import os
-
-import gtk
-
-from sugar.bots import Bot
-
-basedir = os.path.dirname(__file__)
-
-bot = Bot("Chaitanya", os.path.join(basedir, "chaitanya.jpg"))
-bot.start()
-
-bot = Bot("Kiu", os.path.join(basedir, "kiu.jpg"))
-bot.start()
-
-bot = Bot("Penelope", os.path.join(basedir, "penelope.jpg"))
-bot.start()
-
-gtk.main()
diff --git a/tests/simulator/kiu.py b/tests/simulator/bots/kiu.py
similarity index 97%
rename from tests/simulator/kiu.py
rename to tests/simulator/bots/kiu.py
index 18f30fd1..17b1e1e9 100755
--- a/tests/simulator/kiu.py
+++ b/tests/simulator/bots/kiu.py
@@ -24,7 +24,7 @@ class KiuBot(Bot):
 		self.add_action(action, 20)
 
 		curdir = os.path.abspath(os.path.dirname(__file__))
-		self._icon_file = os.path.join(curdir, 'kiu.jpg')
+		self._icon_file = os.path.join(curdir, '../data/kiu.jpg')
 
 	def __activity_switch_cb(self):
 		self._activity_switch_timeout = None
diff --git a/tests/simulator/LICENSE b/tests/simulator/data/LICENSE
similarity index 100%
rename from tests/simulator/LICENSE
rename to tests/simulator/data/LICENSE
diff --git a/tests/simulator/chaitanya.jpg b/tests/simulator/data/chaitanya.jpg
similarity index 100%
rename from tests/simulator/chaitanya.jpg
rename to tests/simulator/data/chaitanya.jpg
diff --git a/tests/simulator/kiu.jpg b/tests/simulator/data/kiu.jpg
similarity index 100%
rename from tests/simulator/kiu.jpg
rename to tests/simulator/data/kiu.jpg
diff --git a/tests/simulator/penelope.jpg b/tests/simulator/data/penelope.jpg
similarity index 100%
rename from tests/simulator/penelope.jpg
rename to tests/simulator/data/penelope.jpg