diff --git a/.gitignore b/.gitignore
index 7fb46fa..ff72e2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/nbproject/private/
-/vendor/
 /composer.lock
-/nbproject/
-/tmp/
\ No newline at end of file
+/vendor
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..28b4fe9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Angel Koilov <angel.koilov@gmail.com> aka po_taka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index 50ded1d..dd40e45 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1 @@
-bbcode
-======
-v0.0.2 pre-alpha
-added tags for Bold, Italic & Underline
-
-v0.0.1 pre-alpha
-not ready to use. Active development!
\ No newline at end of file
+# Active development!
diff --git a/composer.json b/composer.json
index 2870b96..a607c80 100755
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,11 @@
 {
-	"name": "-",
-	"type": "-",
-	"description": "-",
+	"name": "potaka/bbcode",
+	"type": "library",
+	"description": "php parser for bb code",
+    "license": "MIT",
 	"require": {
-		"phpUnit/phpUnit": "*"
+        "php": ">=7.0",
+		"phpUnit/phpUnit": "5.6.*"
 	},
 	"autoload": {
 		"psr-0": {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100755
index 891096f..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../vendor/autoload.php';
-
-spl_autoload_register(
-        function ($className) {
-            $file = str_replace('\\', '/', $className);
-            $file = __DIR__ . '/../src/' . $file . '.php';
-            if (is_file($file)) {
-                require_once $file;
-            } else {
-                echo $file . ' not found' . PHP_EOL;
-            }
-        }
-);
\ No newline at end of file
diff --git a/tests/phpUnit/.gitignore b/tests/phpUnit/.gitignore
new file mode 100644
index 0000000..711deb3
--- /dev/null
+++ b/tests/phpUnit/.gitignore
@@ -0,0 +1,2 @@
+/codeCoverage*
+
diff --git a/tests/Potaka/BbCode/BbCodeTest.php b/tests/phpUnit/Test/Potaka/BbCode/BbCodeTest.php
similarity index 100%
rename from tests/Potaka/BbCode/BbCodeTest.php
rename to tests/phpUnit/Test/Potaka/BbCode/BbCodeTest.php
diff --git a/tests/Potaka/BbCode/Tag/BoldTest.php b/tests/phpUnit/Test/Potaka/BbCode/Tag/BoldTest.php
similarity index 100%
rename from tests/Potaka/BbCode/Tag/BoldTest.php
rename to tests/phpUnit/Test/Potaka/BbCode/Tag/BoldTest.php
diff --git a/tests/Potaka/BbCode/Tag/ItalicTest.php b/tests/phpUnit/Test/Potaka/BbCode/Tag/ItalicTest.php
similarity index 100%
rename from tests/Potaka/BbCode/Tag/ItalicTest.php
rename to tests/phpUnit/Test/Potaka/BbCode/Tag/ItalicTest.php
diff --git a/tests/Potaka/BbCode/Tag/UnderlineTest.php b/tests/phpUnit/Test/Potaka/BbCode/Tag/UnderlineTest.php
similarity index 100%
rename from tests/Potaka/BbCode/Tag/UnderlineTest.php
rename to tests/phpUnit/Test/Potaka/BbCode/Tag/UnderlineTest.php
diff --git a/tests/phpUnit/bootstrap.php b/tests/phpUnit/bootstrap.php
new file mode 100755
index 0000000..48b34a7
--- /dev/null
+++ b/tests/phpUnit/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__ . '/../../vendor/autoload.php';
diff --git a/phpunit.xml b/tests/phpUnit/phpunit.xml
similarity index 63%
rename from phpunit.xml
rename to tests/phpUnit/phpunit.xml
index 6a989de..ee954d2 100755
--- a/phpunit.xml
+++ b/tests/phpUnit/phpunit.xml
@@ -1,6 +1,6 @@
 <phpunit backupGlobals="true"
 		 backupStaticAttributes="false"
-		 bootstrap="./tests/bootstrap.php"
+		 bootstrap="bootstrap.php"
 		 cacheTokens="false"
 		 colors="true"
 		 convertErrorsToExceptions="true"
@@ -8,24 +8,17 @@
 		 convertWarningsToExceptions="true"
 		 forceCoversAnnotation="false"
 		 mapTestClassNameToCoveredClassName="false"
-		 printerClass="PHPUnit_TextUI_ResultPrinter"
 		 processIsolation="false"
-		 stopOnError="false"
-		 stopOnFailure="false"
-		 stopOnIncomplete="false"
-		 stopOnSkipped="false"
 		 strict="false"
-		 verbose="false">
-  
-  
+		 verbose="false"
+>
 	<testsuites>
 		<testsuite name="My Test Suite">
-			<directory>./tests</directory>
-			
+			<directory>./Test</directory>
 		</testsuite>
 	</testsuites>
 	<logging>
-		<log type="coverage-html" target="tmp/report" charset="UTF-8" highlight="false" lowUpperBound="35" highLowerBound="70"/>
+		<log type="coverage-html" target="codeCoverage" charset="UTF-8" highlight="false" lowUpperBound="35" highLowerBound="70"/>
 		<log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
 		<!--		<log type="testdox-html" target="tmp/testdox.html"/>-->
 	</logging>
@@ -35,8 +28,7 @@
 			<directory>vendor</directory>
 		</blacklist>
 		<whitelist>
-			<directory>src</directory>
+			<directory>../../src</directory>
 		</whitelist>
 	</filter>
 </phpunit>
-