diff --git a/.gitignore b/.gitignore
index 3e0c941..2181118 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,5 @@ composer.phar
 # composer.lock
 /build/logs
 
-.phpunit.result.cache
+*.cache
 .idea/
diff --git a/.php_cs b/.php-cs-fixer.php
similarity index 86%
rename from .php_cs
rename to .php-cs-fixer.php
index d6e55f5..a95673d 100644
--- a/.php_cs
+++ b/.php-cs-fixer.php
@@ -13,16 +13,16 @@
 with this source code in the file LICENSE.
 EOT;
 
-return PhpCsFixer\Config::create()
-    ->setRules(array(
+return (new PhpCsFixer\Config())
+    ->setRules([
         '@Symfony' => true,
         'simplified_null_return' => false,
         'phpdoc_no_empty_return' => false,
-        'yoda_style' => null,
+        'yoda_style' => false,
         'self_accessor' => false,
         'no_mixed_echo_print' => ['use' => 'print'],
         'header_comment' => ['header' => $header],
-    ))
+    ])
     ->setUsingCache(false)
     ->setFinder($finder)
 ;
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f027f35..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: php
-
-php:
-    - 5.6
-    - 7.0
-    - 7.1
-
-before_install:
-    - composer self-update
-    - composer --version
-    - if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then wget http://get.sensiolabs.org/php-cs-fixer.phar -O php-cs-fixer.phar; fi
-    - if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then php php-cs-fixer.phar --version; fi
-
-install:
-    - COMPOSER_ROOT_VERSION=dev-master composer update --prefer-source
-
-script:
-    - if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then php php-cs-fixer.phar fix --dry-run -v; fi
-    - if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi
-
-after_script:
-    - if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then vendor/bin/coveralls -v; fi
diff --git a/README.md b/README.md
index a9dcd46..8c2382b 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 SCIM schema PHP library with support for both v1 and v2.
 
+> This library is a fork of https://github.com/tmilos/scim-s to make it compatible with modern PHP
+
 > **Note:** This library is still work in progress, and you are welcome to help and contribute
 
 > It was made by the specs from [SimpleCloud](http://www.simplecloud.info/) and by the example documents generated by
@@ -21,7 +23,7 @@ SCIM schema PHP library with support for both v1 and v2.
 Install Scim Schema using composer:
 
 ```bash
-composer require tmilos/scim-schema
+composer require protonlabs/scim-schema
 ```
 
 # Usage
diff --git a/composer.json b/composer.json
index 8443ee9..9dade69 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,10 @@
 {
-    "name": "tmilos/scim-schema",
+    "name": "protonlabs/scim-schema",
     "license": "MIT",
     "description": "SCIM schema library",
     "type": "library",
     "keywords": ["scim", "scim schema", "RFC7643"],
-    "homepage": "https://github.com/tmilos/scim-schema",
+    "homepage": "https://github.com/protonlabs/scim-schema",
     "authors": [
         {
             "name": "Milos Tomic",
diff --git a/composer.lock b/composer.lock
index a8e665f..8df589b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "be79ada108dcb4ab0d5660c34374910e",
+    "content-hash": "c78b87801a88bcc9853de710eb7e59c3",
     "packages": [],
     "packages-dev": [
         {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 24e5a12..09e3fdb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,4 +15,10 @@
             <directory>tests</directory>
         </testsuite>
     </testsuites>
+
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>