--- a/test/testasm.py	Fri Feb 28 18:07:14 2014 +0100
+++ b/test/testasm.py	Sat Mar 01 15:40:31 2014 +0100
@@ -6,8 +6,8 @@
 from ppci.assembler import tokenize, Assembler, Lexer
 from ppci.objectfile import ObjectFile
 from ppci.linker import Linker
-import outstream
-from target import Label
+from ppci.outstream import BinaryOutputStream
+from ppci.target.basetarget import Label
 
 
 class AssemblerLexingCase(unittest.TestCase):
@@ -96,7 +96,7 @@
 class OustreamTestCase(unittest.TestCase):
     def test1(self):
         obj = ObjectFile()
-        o = outstream.BinaryOutputStream(obj)
+        o = BinaryOutputStream(obj)
         o.selectSection('.text')
         o.emit(Label('a'))
         self.assertSequenceEqual(bytes(), obj.get_section('.text').data)