diff --git a/.travis.yml b/.travis.yml
index 0dfb679..a98875c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,5 @@
-language: php
\ No newline at end of file
+language: php
+php:
+  - 7.3
+install:
+  - composer install
\ No newline at end of file
diff --git a/README.md b/README.md
index 474fbae..fbb63f4 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Sportmonks Soccer API PHP Client
 
+[![Build Status](https://travis-ci.org/joesaunderson/sportmonks-soccer.svg?branch=master)](https://travis-ci.org/joesaunderson/sportmonks-soccer)
+
 PHP Library for [Sportmonks](https://sportmonks.com/) Soccer API. Developed by [Joe Saunderson](mailto:joesaunderson@me.com).
 
 ## Prerequisites
diff --git a/composer.json b/composer.json
index 9399bc6..f04a4f8 100644
--- a/composer.json
+++ b/composer.json
@@ -13,15 +13,9 @@
   "require": {
     "symfony/http-client" : "v4.3.0-BETA2"
   },
-  "require-dev": {
-    "phpunit/phpunit": "^8"
-  },
   "autoload": {
     "psr-4": {
       "Sportmonks\\Soccer\\": "src/"
     }
-  },
-  "autoload-dev": {
-
   }
 }
diff --git a/phpunit.xml b/phpunit.xml
index 00f9aaa..4692ea7 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.1/phpunit.xsd"
          backupGlobals="true"
-         colors="true"
          bootstrap="vendor/autoload.php"
-         failOnRisky="true"
-         failOnWarning="true"
->
+         executionOrder="depends,defects"
+         forceCoversAnnotation="true"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         verbose="true">
+
     <testsuites>
-        <testsuite name="Test Suite">
-            <directory>./tests/</directory>
+        <testsuite name="default">
+            <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
-</phpunit>
\ No newline at end of file
+
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/endpoint/Bookmaker.php b/src/Endpoint/Bookmaker.php
similarity index 100%
rename from src/endpoint/Bookmaker.php
rename to src/Endpoint/Bookmaker.php
diff --git a/src/endpoint/Coach.php b/src/Endpoint/Coach.php
similarity index 100%
rename from src/endpoint/Coach.php
rename to src/Endpoint/Coach.php
diff --git a/src/endpoint/Commentary.php b/src/Endpoint/Commentary.php
similarity index 100%
rename from src/endpoint/Commentary.php
rename to src/Endpoint/Commentary.php
diff --git a/src/endpoint/Continent.php b/src/Endpoint/Continent.php
similarity index 100%
rename from src/endpoint/Continent.php
rename to src/Endpoint/Continent.php
diff --git a/src/endpoint/Country.php b/src/Endpoint/Country.php
similarity index 100%
rename from src/endpoint/Country.php
rename to src/Endpoint/Country.php
diff --git a/src/endpoint/Fixture.php b/src/Endpoint/Fixture.php
similarity index 100%
rename from src/endpoint/Fixture.php
rename to src/Endpoint/Fixture.php
diff --git a/src/endpoint/Head2Head.php b/src/Endpoint/Head2Head.php
similarity index 100%
rename from src/endpoint/Head2Head.php
rename to src/Endpoint/Head2Head.php
diff --git a/src/endpoint/League.php b/src/Endpoint/League.php
similarity index 100%
rename from src/endpoint/League.php
rename to src/Endpoint/League.php
diff --git a/src/endpoint/LiveScore.php b/src/Endpoint/LiveScore.php
similarity index 100%
rename from src/endpoint/LiveScore.php
rename to src/Endpoint/LiveScore.php
diff --git a/src/endpoint/Market.php b/src/Endpoint/Market.php
similarity index 100%
rename from src/endpoint/Market.php
rename to src/Endpoint/Market.php
diff --git a/src/endpoint/Odd.php b/src/Endpoint/Odd.php
similarity index 100%
rename from src/endpoint/Odd.php
rename to src/Endpoint/Odd.php
diff --git a/src/endpoint/Player.php b/src/Endpoint/Player.php
similarity index 100%
rename from src/endpoint/Player.php
rename to src/Endpoint/Player.php
diff --git a/src/endpoint/Round.php b/src/Endpoint/Round.php
similarity index 100%
rename from src/endpoint/Round.php
rename to src/Endpoint/Round.php
diff --git a/src/endpoint/Season.php b/src/Endpoint/Season.php
similarity index 100%
rename from src/endpoint/Season.php
rename to src/Endpoint/Season.php
diff --git a/src/endpoint/Stage.php b/src/Endpoint/Stage.php
similarity index 100%
rename from src/endpoint/Stage.php
rename to src/Endpoint/Stage.php
diff --git a/src/endpoint/Standing.php b/src/Endpoint/Standing.php
similarity index 100%
rename from src/endpoint/Standing.php
rename to src/Endpoint/Standing.php
diff --git a/src/endpoint/Team.php b/src/Endpoint/Team.php
similarity index 100%
rename from src/endpoint/Team.php
rename to src/Endpoint/Team.php
diff --git a/src/endpoint/TeamSquad.php b/src/Endpoint/TeamSquad.php
similarity index 100%
rename from src/endpoint/TeamSquad.php
rename to src/Endpoint/TeamSquad.php
diff --git a/src/endpoint/TopScorer.php b/src/Endpoint/TopScorer.php
similarity index 100%
rename from src/endpoint/TopScorer.php
rename to src/Endpoint/TopScorer.php
diff --git a/src/endpoint/TvStation.php b/src/Endpoint/TvStation.php
similarity index 100%
rename from src/endpoint/TvStation.php
rename to src/Endpoint/TvStation.php
diff --git a/src/endpoint/Venue.php b/src/Endpoint/Venue.php
similarity index 100%
rename from src/endpoint/Venue.php
rename to src/Endpoint/Venue.php
diff --git a/src/endpoint/VideoHighlight.php b/src/Endpoint/VideoHighlight.php
similarity index 100%
rename from src/endpoint/VideoHighlight.php
rename to src/Endpoint/VideoHighlight.php
diff --git a/src/exception/ApiRequestException.php b/src/Exception/ApiRequestException.php
similarity index 100%
rename from src/exception/ApiRequestException.php
rename to src/Exception/ApiRequestException.php
diff --git a/src/exception/InvalidDateFormatException.php b/src/Exception/InvalidDateFormatException.php
similarity index 100%
rename from src/exception/InvalidDateFormatException.php
rename to src/Exception/InvalidDateFormatException.php