diff --git a/.coveralls.yml b/.coveralls.yml
index e2ec3db..177d006 100644
--- a/.coveralls.yml
+++ b/.coveralls.yml
@@ -1,4 +1,4 @@
-src_dir: .
+src_dir: ./src
 coverage_clover: build/logs/clover.xml
 json_path: build/logs/coveralls-upload.json
 exclude_no_stmt: true
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
deleted file mode 100644
index 79e8a02..0000000
--- a/Tests/bootstrap.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Volcanus libraries for PHP
- *
- * @copyright 2011-2013 k-holy <k.holy74@gmail.com>
- * @license The MIT License (MIT)
- */
-spl_autoload_register(function($className) {
-	$namespace = 'Volcanus\RadixConverter';
-	if (0 === strpos(ltrim($className, DIRECTORY_SEPARATOR), $namespace)) {
-		$path = realpath(__DIR__ . '/..') . substr(
-			str_replace('\\', DIRECTORY_SEPARATOR, $className),
-			strlen($namespace)
-		).'.php';
-		if (file_exists($path)) {
-			return include $path;
-		}
-	}
-	return false;
-}, true, true);
diff --git a/composer.json b/composer.json
index 85c4340..e205b52 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "volcanus/radix-converter",
     "homepage": "https://github.com/k-holy/volcanus-radix-converter",
     "type": "library",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "license": "MIT",
     "authors": [
         {
@@ -11,12 +11,10 @@
         }
     ],
     "autoload": {
-        "psr-0": { "Volcanus\\RadixConverter": "." }
+        "psr-0": { "Volcanus\\RadixConverter": "src/" }
     },
-    "target-dir": "Volcanus/RadixConverter",
     "require": {
-        "php": ">=5.3",
-        "ext-bcmath" : "*"
+        "php": ">=5.3.3"
     },
     "require-dev": {
         "satooshi/php-coveralls": "dev-master"
diff --git a/phpunit.xml b/phpunit.xml
index 0d6c923..cf8f44f 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,7 @@
 <phpunit
     backupGlobals="false"
     backupStaticAttributes="false"
-    bootstrap="Tests/bootstrap.php"
+    bootstrap="tests/bootstrap.php"
     colors="true"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
@@ -18,19 +18,16 @@
 >
     <testsuites>
         <testsuite name="Volcanus_RadixConverter">
-            <directory suffix="Test.php">./Tests/</directory>
+            <directory suffix="Test.php">./tests/Volcanus/RadixConverter/Test/</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
-            <directory>.</directory>
+            <directory>./src</directory>
             <exclude>
-                <directory>./Tests</directory>
+                <directory>./tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>
     </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
-    </logging>
 </phpunit>
diff --git a/RadixConverter.php b/src/Volcanus/RadixConverter/RadixConverter.php
similarity index 100%
rename from RadixConverter.php
rename to src/Volcanus/RadixConverter/RadixConverter.php
diff --git a/testrunner.yml b/testrunner.yml
index d194037..48f83f0 100644
--- a/testrunner.yml
+++ b/testrunner.yml
@@ -3,11 +3,12 @@ general:
   test_targets:
     recursive: true
     resources:
-      - Tests
+      - tests
   autotest:
     enabled: false
     watch_dirs:
-      - Tests
+      - src
+      - tests
   notify: true
 
 phpunit:
diff --git a/Tests/RadixConverterTest.php b/tests/Volcanus/RadixConveter/Test/RadixConverterTest.php
similarity index 99%
rename from Tests/RadixConverterTest.php
rename to tests/Volcanus/RadixConveter/Test/RadixConverterTest.php
index 885056a..7b862a1 100644
--- a/Tests/RadixConverterTest.php
+++ b/tests/Volcanus/RadixConveter/Test/RadixConverterTest.php
@@ -5,7 +5,7 @@
  * @copyright 2011-2013 k-holy <k.holy74@gmail.com>
  * @license The MIT License (MIT)
  */
-namespace Volcanus\RadixConverter\Tests;
+namespace Volcanus\RadixConverter\Test;
 
 use Volcanus\RadixConverter\RadixConverter;
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..fc3aa4d
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Volcanus libraries for PHP
+ *
+ * @copyright 2011-2013 k-holy <k.holy74@gmail.com>
+ * @license The MIT License (MIT)
+ */
+error_reporting(E_ALL | E_STRICT | E_DEPRECATED);
+
+$loader = include realpath(__DIR__ . '/../vendor/autoload.php');
+$loader->add('Volcanus\RadixConverter\Test', __DIR__);