--- a/test/testarmasm.py	Fri Feb 28 18:07:14 2014 +0100
+++ b/test/testarmasm.py	Sat Mar 01 15:40:31 2014 +0100
@@ -1,16 +1,16 @@
 import unittest
-import outstream
+from ppci.outstream import BinaryOutputStream
 from ppci.objectfile import ObjectFile
 from asm import Assembler
 from testasm import AsmTestCaseBase
-from target.target_list import arm_target, thumb_target
+from ppci.target.target_list import arm_target, thumb_target
 
 
 class ThumbAssemblerTestCase(AsmTestCaseBase):
     def setUp(self):
         self.t = thumb_target
         self.obj = ObjectFile()
-        self.o = outstream.BinaryOutputStream(self.obj)
+        self.o = BinaryOutputStream(self.obj)
         self.o.selectSection('.text')
         self.a = Assembler(target=self.t, stream=self.o)
 
@@ -153,7 +153,7 @@
     def setUp(self):
         self.t = arm_target
         self.obj = ObjectFile()
-        self.o = outstream.BinaryOutputStream(self.obj)
+        self.o = BinaryOutputStream(self.obj)
         self.o.selectSection('.text')
         self.a = Assembler(target=self.t, stream=self.o)