6 files changed, 45 insertions, 63 deletions

diff --git a/src/lzssblock.nim b/src/blocks/lzssblock.nim
index 317e768..f68f665 100644
--- a/src/lzssblock.nim
+++ b/src/blocks/lzssblock.nim
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import bitio/bitreader, bitio/bitwriter
+import ../bitio/bitreader, ../bitio/bitwriter
 
 type LzssBlock* = object
   discard
diff --git a/src/rawblock.nim b/src/blocks/rawblock.nim
index b4920fc..2b32831 100644
--- a/src/rawblock.nim
+++ b/src/blocks/rawblock.nim
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import bitio/integers, bitio/bitreader, bitio/bitwriter
+import ../bitio/integers, ../bitio/bitreader, ../bitio/bitwriter
 
 const maxDataBitLength = high(uint16).int
 const bitLengthFieldBitLength = 2 * wordBitLength
diff --git a/src/streamblock.nim b/src/blocks/streamblock.nim
index 489097e..c904af7 100644
--- a/src/streamblock.nim
+++ b/src/blocks/streamblock.nim
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import sequtils
-import bitio/integers, bitio/bitreader, bitio/bitwriter
+import ../bitio/integers, ../bitio/bitreader, ../bitio/bitwriter
 import rawblock, lzssblock
 
 type BlockKind* = enum
diff --git a/src/main.nim b/src/main.nim
index 450f52d..cf76f5e 100644
--- a/src/main.nim
+++ b/src/main.nim
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import os, streams, sugar
-import bitio/bitreader, bitio/bitwriter, streamblock
+import bitio/bitreader, bitio/bitwriter, blocks/streamblock
 
 proc transform*(operation: (BitReader, BitWriter) -> void, input, output: string) =
   let inputStream = openFileStream(input, fmRead)
diff --git a/tests/tstreamblock.nim b/tests/tblocks.nim
index 57eaf3a..540317d 100644
--- a/tests/tstreamblock.nim
+++ b/tests/tblocks.nim
@@ -15,7 +15,46 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import unittest, streams
-import bitio/bitreader, bitio/bitwriter, streamblock
+import bitio/bitreader, bitio/bitwriter, blocks/rawblock, blocks/streamblock
+
+suite "rawblock":
+  test "serialise":
+    let rawStream = newStringStream()
+    defer: rawStream.close()
+    rawStream.write(0xFEDC_BA98_7654_3210'u64)
+    rawStream.setPosition(0)
+    let rawBitReader = rawStream.bitReader()
+    let rawBlock = rawblock.readRaw(rawBitReader)
+
+    let outputStream = newStringStream()
+    defer: outputStream.close()
+    let outputBitWriter = outputStream.bitWriter()
+    rawBlock.writeSerialisedTo(outputBitWriter)
+    outputBitWriter.flush()
+
+    outputStream.setPosition(0)
+    check outputStream.readUint16() == 64
+    check outputStream.readUint64() == 0xFEDC_BA98_7654_3210'u64
+    check outputStream.atEnd()
+
+  test "deserialise":
+    let serialisedStream = newStringStream()
+    defer: serialisedStream.close()
+    serialisedStream.write(60'u16)
+    serialisedStream.write(0xFEDC_BA98_7654_3210'u64)
+    serialisedStream.setPosition(0)
+    let serialisedBitReader = serialisedStream.bitReader()
+    let rawBlock = rawBlock.readSerialised(serialisedBitReader)
+
+    let outputStream = newStringStream()
+    defer: outputStream.close()
+    let outputBitWriter = outputStream.bitWriter()
+    rawBlock.writeRawTo(outputBitWriter)
+    outputBitWriter.flush()
+
+    outputStream.setPosition(0)
+    check outputStream.readUint64 == 0x0EDC_BA98_7654_3210'u64
+    check outputStream.atEnd()
 
 suite "streamblock":
   test "serialise":
@@ -54,7 +93,7 @@ suite "streamblock":
 
     serialisedStream.setPosition(0)
     let serialisedBitReader = serialisedStream.bitReader()
-    let streamBlock = readSerialised(serialisedBitReader)
+    let streamBlock = streamblock.readSerialised(serialisedBitReader)
 
     let outputStream = newStringStream()
     defer: outputStream.close()
diff --git a/tests/trawblock.nim b/tests/trawblock.nim
deleted file mode 100644
index 0271e33..0000000
--- a/tests/trawblock.nim
+++ /dev/null
@@ -1,57 +0,0 @@
-# gzip-like LZSS compressor
-# Copyright (C) 2018  Pacien TRAN-GIRARD
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import unittest, streams
-import bitio/bitreader, bitio/bitwriter, rawblock
-
-suite "rawblock":
-  test "serialise":
-    let rawStream = newStringStream()
-    defer: rawStream.close()
-    rawStream.write(0xFEDC_BA98_7654_3210'u64)
-    rawStream.setPosition(0)
-    let rawBitReader = rawStream.bitReader()
-    let rawBlock = rawblock.readRaw(rawBitReader)
-
-    let outputStream = newStringStream()
-    defer: outputStream.close()
-    let outputBitWriter = outputStream.bitWriter()
-    rawBlock.writeSerialisedTo(outputBitWriter)
-    outputBitWriter.flush()
-
-    outputStream.setPosition(0)
-    check outputStream.readUint16() == 64
-    check outputStream.readUint64() == 0xFEDC_BA98_7654_3210'u64
-    check outputStream.atEnd()
-
-  test "deserialise":
-    let serialisedStream = newStringStream()
-    defer: serialisedStream.close()
-    serialisedStream.write(60'u16)
-    serialisedStream.write(0xFEDC_BA98_7654_3210'u64)
-    serialisedStream.setPosition(0)
-    let serialisedBitReader = serialisedStream.bitReader()
-    let rawBlock = rawBlock.readSerialised(serialisedBitReader)
-
-    let outputStream = newStringStream()
-    defer: outputStream.close()
-    let outputBitWriter = outputStream.bitWriter()
-    rawBlock.writeRawTo(outputBitWriter)
-    outputBitWriter.flush()
-
-    outputStream.setPosition(0)
-    check outputStream.readUint64 == 0x0EDC_BA98_7654_3210'u64
-    check outputStream.atEnd()