diff --git a/src/COMPR.php b/src/COMPR.php
new file mode 100644
index 0000000..664b679
--- /dev/null
+++ b/src/COMPR.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Class that holds compression type and level constants.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Nicolai Ehemann <en@enlightened.de>
+ * @author André Rothe <arothe@zks.uni-leipzig.de>
+ * @copyright Copyright (C) 2013-2015 Nicolai Ehemann and contributors
+ * @license GNU GPL
+ * @version 1.0
+ */
+namespace ZipStreamer;
+
+class COMPR {
+  // compression method
+  const STORE = 0x0000; //  0 - The file is stored (no compression)
+  const DEFLATE = 0x0008; //  8 - The file is deflated
+
+  // compression level (for deflate compression)
+  const NONE = 0;
+  const NORMAL = 1;
+  const MAXIMUM = 2;
+  const SUPERFAST = 3;
+}
diff --git a/src/Count64.php b/src/Count64.php
new file mode 100644
index 0000000..a7a0fef
--- /dev/null
+++ b/src/Count64.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Simple class to support some very basic operations on 64 bit intergers
+ * on 32 bit machines.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Nicolai Ehemann <en@enlightened.de>
+ * @copyright Copyright (C) 2013-2014 Nicolai Ehemann and contributors
+ * @license GNU GPL
+ */
+namespace ZipStreamer;
+
+use \ZipStreamer\Lib\Count64_32;
+use \ZipStreamer\Lib\Count64_64;
+
+const INT64_HIGH_MAP = 0xffffffff00000000;
+const INT64_LOW_MAP =  0x00000000ffffffff;
+const INT_MAX_32 = 0xffffffff;
+
+/**
+ * Unsigned right shift
+ *
+ * @param int $bits integer to be shifted
+ * @param int $shift number of bits to be shifted
+ * @return int shifted integer
+ */
+function urShift($bits, $shift) {
+  if ($shift == 0) {
+    return $bits;
+  }
+  return ($bits >> $shift) & ~(1 << (8 * PHP_INT_SIZE - 1) >> ($shift - 1));
+}
+
+/**
+ * Convert binary data string to readable hex string
+ *
+ * @param string $data binary string
+ * @return string readable hex string
+ */
+function byte2hex($data) {
+  return unpack("h*", $data);
+}
+
+/**
+ * Pack 1 byte data into binary string
+ *
+ * @param mixed $data data
+ * @return string 1 byte binary string
+ */
+function pack8($data) {
+  return pack('C', $data);
+}
+
+/**
+ * Pack 2 byte data into binary string, little endian format
+ *
+ * @param mixed $data data
+ * @return string 2 byte binary string
+ */
+function pack16le($data) {
+  return pack('v', $data);
+}
+
+/**
+ * Unpack 2 byte binary string, little endian format to 2 byte data
+ *
+ * @param string $data binary string
+ * @return integer 2 byte data
+ */
+function unpack16le($data) {
+  $result = unpack('v', $data);
+  return $result[1];
+}
+
+/**
+ * Pack 4 byte data into binary string, little endian format
+ *
+ * @param mixed $data data
+ * @return 4 byte binary string
+ */
+function pack32le($data) {
+  return pack('V', $data);
+}
+
+/**
+ * Unpack 4 byte binary string, little endian format to 4 byte data
+ *
+ * @param string $data binary string
+ * @return integer 4 byte data
+ */
+function unpack32le($data) {
+  $result = unpack('V', $data);
+  return $result[1];
+}
+
+/**
+ * Pack 8 byte data into binary string, little endian format
+ *
+ * @param mixed $data data
+ * @return string 8 byte binary string
+ */
+function pack64le($data) {
+  if (is_object($data)) {
+    if ("Count64_32" == get_class($data)) {
+      $value = $data->_getValue();
+      $hiBytess = $value[0];
+      $loBytess = $value[1];
+    } else {
+      $hiBytess = ($data->_getValue() & INT64_HIGH_MAP) >> 32;
+      $loBytess = $data->_getValue() & INT64_LOW_MAP;
+    }
+  } else if (4 == PHP_INT_SIZE) {
+    $hiBytess = 0;
+    $loBytess = $data;
+  } else {
+    $hiBytess = ($data & INT64_HIGH_MAP) >> 32;
+    $loBytess = $data & INT64_LOW_MAP;
+  }
+  return pack('VV', $loBytess, $hiBytess);
+}
+
+/**
+ * Unpack 8 byte binary string, little endian format to 8 byte data
+ *
+ * @param string $data binary string
+ * @return Count64Base data
+ */
+function unpack64le($data) {
+  $bytes = unpack('V2', $data);
+  return Count64::construct(array(
+      $bytes[1],
+      $bytes[2]
+  ));
+}
+
+abstract class Count64 {
+  public static function construct($value = 0, $limit32Bit = False) {
+    if (4 == PHP_INT_SIZE) {
+      return new Count64_32($value, $limit32Bit);
+    } else {
+      return new Count64_64($value, $limit32Bit);
+    }
+  }
+}
diff --git a/src/Lib/Count64Base.php b/src/Lib/Count64Base.php
new file mode 100644
index 0000000..7ae5dcd
--- /dev/null
+++ b/src/Lib/Count64Base.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Simple class to support some very basic operations on 64 bit intergers
+ * on 32 bit machines.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Nicolai Ehemann <en@enlightened.de>
+ * @copyright Copyright (C) 2013-2014 Nicolai Ehemann and contributors
+ * @license GNU GPL
+ */
+namespace ZipStreamer\Lib;
+
+abstract class Count64Base {
+  protected $limit32Bit = False;
+
+  function __construct($value = 0, $limit32Bit = False) {
+    $this->limit32Bit = $limit32Bit;
+    $this->set($value);
+  }
+
+  abstract public function set($value);
+  abstract public function add($value);
+  abstract public function getHiBytes();
+  abstract public function getLoBytes();
+  abstract public function _getValue();
+
+  const EXCEPTION_SET_INVALID_ARGUMENT = "Count64 object can only be set() to integer or Count64 values";
+  const EXCEPTION_ADD_INVALID_ARGUMENT = "Count64 object can only be add()ed integer or Count64 values";
+  const EXCEPTION_32BIT_OVERFLOW = "Count64 object limited to 32 bit (overflow)";
+}
diff --git a/src/Lib/Count64_32.php b/src/Lib/Count64_32.php
new file mode 100644
index 0000000..e8c7ceb
--- /dev/null
+++ b/src/Lib/Count64_32.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Simple class to support some very basic operations on 64 bit intergers
+ * on 32 bit machines.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Nicolai Ehemann <en@enlightened.de>
+ * @copyright Copyright (C) 2013-2014 Nicolai Ehemann and contributors
+ * @license GNU GPL
+ */
+namespace ZipStreamer\Lib;
+
+class Count64_32 extends Count64Base {
+  private $loBytes;
+  private $hiBytes;
+
+  public function getHiBytes() {
+    return $this->hiBytes;
+  }
+
+  public function getLoBytes() {
+    return $this->loBytes;
+  }
+
+  public function _getValue() {
+    return array($this->hiBytes, $this->loBytes);
+  }
+
+  public function set($value) {
+    if (is_int($value)) {
+      $this->loBytes = $value;
+      $this->hiBytes = 0;
+    } else if (is_array($value) && 2 == sizeof($value)) {
+      $this->loBytes = $value[0];
+      if ($this->limit32Bit && 0 !== $value[1]) {
+        throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
+      }
+      $this->hiBytes = $value[1];
+    } else if (is_object($value) && __CLASS__ == get_class($value)) {
+      $value = $value->_getValue();
+          if ($this->limit32Bit && 0 !== $value[0]) {
+        throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
+      }
+      $this->hiBytes = $value[0];
+      $this->loBytes = $value[1];
+    } else {
+      throw new \InvalidArgumentException(self::EXCEPTION_SET_INVALID_ARGUMENT);
+    }
+    return $this;
+  }
+
+  public function add($value) {
+    if (is_int($value)) {
+      $sum = (int) ($this->loBytes + $value);
+      // overflow!
+      if (($this->loBytes > -1 && $sum < $this->loBytes && $sum > -1)
+        || ($this->loBytes < 0 && ($sum < $this->loBytes || $sum > -1))) {
+        if ($this->limit32Bit) {
+          throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
+        }
+        $this->hiBytes = (int) ($this->hiBytes + 1);
+      }
+      $this->loBytes = $sum;
+    } else if (is_object($value) && __CLASS__ == get_class($value)) {
+      $value = $value->_getValue();
+      $sum = (int) ($this->loBytes + $value[1]);
+      if (($this->loBytes > -1 && $sum < $this->loBytes && $sum > -1)
+        || ($this->loBytes < 0 && ($sum < $this->loBytes || $sum > -1))) {
+        if ($this->limit32Bit) {
+          throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
+        }
+        $this->hiBytes = (int) ($this->hiBytes + 1);
+      }
+      $this->loBytes = $sum;
+      if ($this->limit32Bit && 0 !== $value[0]) {
+        throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
+      }
+      $this->hiBytes = (int) ($this->hiBytes + $value[0]);
+    } else {
+      throw new \InvalidArgumentException(self::EXCEPTION_ADD_INVALID_ARGUMENT);
+    }
+    return $this;
+  }
+}
diff --git a/src/Lib/Count64_64.php b/src/Lib/Count64_64.php
new file mode 100644
index 0000000..1a31741
--- /dev/null
+++ b/src/Lib/Count64_64.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Simple class to support some very basic operations on 64 bit intergers
+ * on 32 bit machines.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Nicolai Ehemann <en@enlightened.de>
+ * @copyright Copyright (C) 2013-2014 Nicolai Ehemann and contributors
+ * @license GNU GPL
+ */
+namespace ZipStreamer\Lib;
+
+use const \ZipStreamer\INT64_LOW_MAP;
+use const \ZipStreamer\INT_MAX_32;
+
+class Count64_64 extends Count64Base {
+  private $value;
+
+  public function getHiBytes() {
+    return urShift($this->value, 32);
+  }
+
+  public function getLoBytes() {
+    return $this->value & INT64_LOW_MAP;
+  }
+
+  public function _getValue() {
+    return $this->value;
+  }
+
+  public function set($value) {
+    if (is_int($value)) {
+      if ($this->limit32Bit && INT_MAX_32 < $value) {
+        throw new \OverFlowException(self::EXCEPTION_32BIT_OVERFLOW);
+      }
+      $this->value = $value;
+    } else if (is_array($value) && 2 == sizeof($value)) {
+      if ($this->limit32Bit && 0 !== $value[1]) {
+        throw new \OverFlowException(self::EXCEPTION_32BIT_OVERFLOW);
+      }
+      $this->value = $value[1];
+      $this->value = $this->value << 32;
+      $this->value = $this->value + $value[0];
+    } else if (is_object($value) && __CLASS__ == get_class($value)) {
+      $value = $value->_getValue();
+      if ($this->limit32Bit && INT_MAX_32 < $value) {
+        throw new \OverFlowException(self::EXCEPTION_32BIT_OVERFLOW);
+      }
+      $this->value = $value;
+
+    } else {
+      throw new \InvalidArgumentException(self::EXCEPTION_SET_INVALID_ARGUMENT);
+    }
+    return $this;
+  }
+
+  public function add($value) {
+    if (is_int($value)) {
+      $sum = (int) ($this->value + $value);
+    } else if (is_object($value) && __CLASS__ == get_class($value)) {
+      $sum = (int) ($this->value + $value->_getValue());
+    } else {
+      throw new \InvalidArgumentException(self::EXCEPTION_ADD_INVALID_ARGUMENT);
+    }
+    if ($this->limit32Bit && INT_MAX_32 < $sum) {
+      throw new \OverFlowException(self::EXCEPTION_32BIT_OVERFLOW);
+    }
+    $this->value = $sum;
+    return $this;
+  }
+}
diff --git a/src/ZipStreamer.php b/src/ZipStreamer.php
index 656413b..4542c3f 100644
--- a/src/ZipStreamer.php
+++ b/src/ZipStreamer.php
@@ -31,20 +31,6 @@
  */
 namespace ZipStreamer;
 
-require_once __DIR__ . "/lib/Count64.php";
-
-class COMPR {
-  // compression method
-  const STORE = 0x0000; //  0 - The file is stored (no compression)
-  const DEFLATE = 0x0008; //  8 - The file is deflated
-
-  // compression level (for deflate compression)
-  const NONE = 0;
-  const NORMAL = 1;
-  const MAXIMUM = 2;
-  const SUPERFAST = 3;
-}
-
 class ZipStreamer {
   const VERSION = "1.0";
 
diff --git a/src/lib/Count64.php b/src/lib/Count64.php
deleted file mode 100644
index 4db8bae..0000000
--- a/src/lib/Count64.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-/**
- * Simple class to support some very basic operations on 64 bit intergers
- * on 32 bit machines.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @author Nicolai Ehemann <en@enlightened.de>
- * @copyright Copyright (C) 2013-2014 Nicolai Ehemann and contributors
- * @license GNU GPL
- */
-namespace ZipStreamer;
-
-const INT64_HIGH_MAP = 0xffffffff00000000;
-const INT64_LOW_MAP =  0x00000000ffffffff;
-const INT_MAX_32 = 0xffffffff;
-
-/**
- * Unsigned right shift
- *
- * @param int $bits integer to be shifted
- * @param int $shift number of bits to be shifted
- * @return int shifted integer
- */
-function urShift($bits, $shift) {
-  if ($shift == 0) {
-    return $bits;
-  }
-  return ($bits >> $shift) & ~(1 << (8 * PHP_INT_SIZE - 1) >> ($shift - 1));
-}
-
-/**
- * Convert binary data string to readable hex string
- *
- * @param string $data binary string
- * @return string readable hex string
- */
-function byte2hex($data) {
-  return unpack("h*", $data);
-}
-
-/**
- * Pack 1 byte data into binary string
- *
- * @param mixed $data data
- * @return string 1 byte binary string
- */
-function pack8($data) {
-  return pack('C', $data);
-}
-
-/**
- * Pack 2 byte data into binary string, little endian format
- *
- * @param mixed $data data
- * @return string 2 byte binary string
- */
-function pack16le($data) {
-  return pack('v', $data);
-}
-
-/**
- * Unpack 2 byte binary string, little endian format to 2 byte data
- *
- * @param string $data binary string
- * @return integer 2 byte data
- */
-function unpack16le($data) {
-  $result = unpack('v', $data);
-  return $result[1];
-}
-
-/**
- * Pack 4 byte data into binary string, little endian format
- *
- * @param mixed $data data
- * @return 4 byte binary string
- */
-function pack32le($data) {
-  return pack('V', $data);
-}
-
-/**
- * Unpack 4 byte binary string, little endian format to 4 byte data
- *
- * @param string $data binary string
- * @return integer 4 byte data
- */
-function unpack32le($data) {
-  $result = unpack('V', $data);
-  return $result[1];
-}
-
-/**
- * Pack 8 byte data into binary string, little endian format
- *
- * @param mixed $data data
- * @return string 8 byte binary string
- */
-function pack64le($data) {
-  if (is_object($data)) {
-    if ("Count64_32" == get_class($data)) {
-      $value = $data->_getValue();
-      $hiBytess = $value[0];
-      $loBytess = $value[1];
-    } else {
-      $hiBytess = ($data->_getValue() & INT64_HIGH_MAP) >> 32;
-      $loBytess = $data->_getValue() & INT64_LOW_MAP;
-    }
-  } else if (4 == PHP_INT_SIZE) {
-    $hiBytess = 0;
-    $loBytess = $data;
-  } else {
-    $hiBytess = ($data & INT64_HIGH_MAP) >> 32;
-    $loBytess = $data & INT64_LOW_MAP;
-  }
-  return pack('VV', $loBytess, $hiBytess);
-}
-
-/**
- * Unpack 8 byte binary string, little endian format to 8 byte data
- *
- * @param string $data binary string
- * @return Count64Base data
- */
-function unpack64le($data) {
-  $bytes = unpack('V2', $data);
-  return Count64::construct(array(
-      $bytes[1],
-      $bytes[2]
-  ));
-}
-
-abstract class Count64Base {
-  protected $limit32Bit = False;
-
-  function __construct($value = 0, $limit32Bit = False) {
-    $this->limit32Bit = $limit32Bit;
-    $this->set($value);
-  }
-
-  abstract public function set($value);
-  abstract public function add($value);
-  abstract public function getHiBytes();
-  abstract public function getLoBytes();
-  abstract public function _getValue();
-
-  const EXCEPTION_SET_INVALID_ARGUMENT = "Count64 object can only be set() to integer or Count64 values";
-  const EXCEPTION_ADD_INVALID_ARGUMENT = "Count64 object can only be add()ed integer or Count64 values";
-  const EXCEPTION_32BIT_OVERFLOW = "Count64 object limited to 32 bit (overflow)";
-}
-
-class Count64_32 extends Count64Base {
-  private $loBytes;
-  private $hiBytes;
-
-  public function getHiBytes() {
-    return $this->hiBytes;
-  }
-
-  public function getLoBytes() {
-    return $this->loBytes;
-  }
-
-  public function _getValue() {
-    return array($this->hiBytes, $this->loBytes);
-  }
-
-  public function set($value) {
-    if (is_int($value)) {
-      $this->loBytes = $value;
-      $this->hiBytes = 0;
-    } else if (is_array($value) && 2 == sizeof($value)) {
-      $this->loBytes = $value[0];
-      if ($this->limit32Bit && 0 !== $value[1]) {
-        throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
-      }
-      $this->hiBytes = $value[1];
-    } else if (is_object($value) && __CLASS__ == get_class($value)) {
-      $value = $value->_getValue();
-          if ($this->limit32Bit && 0 !== $value[0]) {
-        throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
-      }
-      $this->hiBytes = $value[0];
-      $this->loBytes = $value[1];
-    } else {
-      throw new \InvalidArgumentException(self::EXCEPTION_SET_INVALID_ARGUMENT);
-    }
-    return $this;
-  }
-
-  public function add($value) {
-    if (is_int($value)) {
-      $sum = (int) ($this->loBytes + $value);
-      // overflow!
-      if (($this->loBytes > -1 && $sum < $this->loBytes && $sum > -1)
-        || ($this->loBytes < 0 && ($sum < $this->loBytes || $sum > -1))) {
-        if ($this->limit32Bit) {
-          throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
-        }
-        $this->hiBytes = (int) ($this->hiBytes + 1);
-      }
-      $this->loBytes = $sum;
-    } else if (is_object($value) && __CLASS__ == get_class($value)) {
-      $value = $value->_getValue();
-      $sum = (int) ($this->loBytes + $value[1]);
-      if (($this->loBytes > -1 && $sum < $this->loBytes && $sum > -1)
-        || ($this->loBytes < 0 && ($sum < $this->loBytes || $sum > -1))) {
-        if ($this->limit32Bit) {
-          throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
-        }
-        $this->hiBytes = (int) ($this->hiBytes + 1);
-      }
-      $this->loBytes = $sum;
-      if ($this->limit32Bit && 0 !== $value[0]) {
-        throw new \OverflowException(self::EXCEPTION_32BIT_OVERFLOW);
-      }
-      $this->hiBytes = (int) ($this->hiBytes + $value[0]);
-    } else {
-      throw new \InvalidArgumentException(self::EXCEPTION_ADD_INVALID_ARGUMENT);
-    }
-    return $this;
-  }
-}
-
-class Count64_64 extends Count64Base {
-  private $value;
-
-  public function getHiBytes() {
-    return urShift($this->value, 32);
-  }
-
-  public function getLoBytes() {
-    return $this->value & INT64_LOW_MAP;
-  }
-
-  public function _getValue() {
-    return $this->value;
-  }
-
-  public function set($value) {
-    if (is_int($value)) {
-      if ($this->limit32Bit && INT_MAX_32 < $value) {
-        throw new \OverFlowException(self::EXCEPTION_32BIT_OVERFLOW);
-      }
-      $this->value = $value;
-    } else if (is_array($value) && 2 == sizeof($value)) {
-      if ($this->limit32Bit && 0 !== $value[1]) {
-        throw new \OverFlowException(self::EXCEPTION_32BIT_OVERFLOW);
-      }
-      $this->value = $value[1];
-      $this->value = $this->value << 32;
-      $this->value = $this->value + $value[0];
-    } else if (is_object($value) && __CLASS__ == get_class($value)) {
-      $value = $value->_getValue();
-      if ($this->limit32Bit && INT_MAX_32 < $value) {
-        throw new \OverFlowException(self::EXCEPTION_32BIT_OVERFLOW);
-      }
-      $this->value = $value;
-
-    } else {
-      throw new \InvalidArgumentException(self::EXCEPTION_SET_INVALID_ARGUMENT);
-    }
-    return $this;
-  }
-
-  public function add($value) {
-    if (is_int($value)) {
-      $sum = (int) ($this->value + $value);
-    } else if (is_object($value) && __CLASS__ == get_class($value)) {
-      $sum = (int) ($this->value + $value->_getValue());
-    } else {
-      throw new \InvalidArgumentException(self::EXCEPTION_ADD_INVALID_ARGUMENT);
-    }
-    if ($this->limit32Bit && INT_MAX_32 < $sum) {
-      throw new \OverFlowException(self::EXCEPTION_32BIT_OVERFLOW);
-    }
-    $this->value = $sum;
-    return $this;
-  }
-}
-
-abstract class Count64 {
-  public static function construct($value = 0, $limit32Bit = False) {
-    if (4 == PHP_INT_SIZE) {
-      return new Count64_32($value, $limit32Bit);
-    } else {
-      return new Count64_64($value, $limit32Bit);
-    }
-  }
-}
diff --git a/test/lib/Count64Test.php b/test/Count64Test.php
similarity index 98%
rename from test/lib/Count64Test.php
rename to test/Count64Test.php
index 8e127ce..be36e1b 100644
--- a/test/lib/Count64Test.php
+++ b/test/Count64Test.php
@@ -6,9 +6,9 @@
 * See COPYING for details.
 */
 
-require_once __DIR__ . '/../../src/lib/Count64.php';
+use \ZipStreamer\Count64;
 
-class TestPack extends PHPUnit_Framework_TestCase
+class TestPack extends \PHPUnit\Framework\TestCase
 {
   public function providerPack16leValues() {
     # input value, description
diff --git a/test/ZipStreamerTest.php b/test/ZipStreamerTest.php
index 37a874d..d0d3ef7 100644
--- a/test/ZipStreamerTest.php
+++ b/test/ZipStreamerTest.php
@@ -8,7 +8,6 @@
  */
 namespace ZipStreamer;
 
-require_once  __DIR__ . "/../src/ZipStreamer.php";
 require_once  __DIR__ . "/ZipComponents.php";
 
 class File {
@@ -31,7 +30,7 @@ public function getSize() {
   }
 }
 
-class TestZipStreamer extends \PHPUnit_Framework_TestCase {
+class TestZipStreamer extends \PHPUnit\Framework\TestCase {
   const ATTR_MADE_BY_VERSION = 0x032d; // made by version (upper byte: UNIX, lower byte v4.5)
   const EXT_FILE_ATTR_DIR = 0x41ed0010;
   const EXT_FILE_ATTR_FILE = 0x81a40000;
diff --git a/test/bootstrap.php b/test/bootstrap.php
new file mode 100644
index 0000000..cf564ec
--- /dev/null
+++ b/test/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once dirname(__DIR__) . '/vendor/autoload.php';
diff --git a/test/integration/UnpackTest.php b/test/integration/UnpackTest.php
index 45db8d7..61b9e64 100644
--- a/test/integration/UnpackTest.php
+++ b/test/integration/UnpackTest.php
@@ -4,7 +4,7 @@
  *
  */
 
-class UnpackTest extends PHPUnit_Framework_TestCase
+class UnpackTest extends \PHPUnit\Framework\TestCase
 {
     private $tmpfname;
 
diff --git a/test/phpunit.xml b/test/phpunit.xml
index d73bdbe..eec7c74 100644
--- a/test/phpunit.xml
+++ b/test/phpunit.xml
@@ -4,6 +4,7 @@
      strict="true"
      verbose="true"
      debug="true"
+     bootstrap="bootstrap.php"
 >
   <testsuite name="ZipStreamer">
     <file>ZipStreamerTest.php</file>