diff --git a/composer.json b/composer.json
index 1b59524..cbcfa6d 100755
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
   },
   "autoload": {
     "psr-4": {
-      "JsonLd\\": "src/JsonLd"
+      "JsonLd\\": "src"
     }
   },
   "autoload-dev": {
diff --git a/src/JsonLd/Context.php b/src/Context.php
similarity index 100%
rename from src/JsonLd/Context.php
rename to src/Context.php
diff --git a/src/JsonLd/ContextTypes/AbstractContext.php b/src/ContextTypes/AbstractContext.php
similarity index 100%
rename from src/JsonLd/ContextTypes/AbstractContext.php
rename to src/ContextTypes/AbstractContext.php
diff --git a/src/JsonLd/ContextTypes/AggregateRating.php b/src/ContextTypes/AggregateRating.php
similarity index 100%
rename from src/JsonLd/ContextTypes/AggregateRating.php
rename to src/ContextTypes/AggregateRating.php
diff --git a/src/JsonLd/ContextTypes/Article.php b/src/ContextTypes/Article.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Article.php
rename to src/ContextTypes/Article.php
diff --git a/src/JsonLd/ContextTypes/Beach.php b/src/ContextTypes/Beach.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Beach.php
rename to src/ContextTypes/Beach.php
diff --git a/src/JsonLd/ContextTypes/BlogPosting.php b/src/ContextTypes/BlogPosting.php
similarity index 100%
rename from src/JsonLd/ContextTypes/BlogPosting.php
rename to src/ContextTypes/BlogPosting.php
diff --git a/src/JsonLd/ContextTypes/BreadcrumbList.php b/src/ContextTypes/BreadcrumbList.php
similarity index 100%
rename from src/JsonLd/ContextTypes/BreadcrumbList.php
rename to src/ContextTypes/BreadcrumbList.php
diff --git a/src/JsonLd/ContextTypes/ContactPoint.php b/src/ContextTypes/ContactPoint.php
similarity index 100%
rename from src/JsonLd/ContextTypes/ContactPoint.php
rename to src/ContextTypes/ContactPoint.php
diff --git a/src/JsonLd/ContextTypes/Corporation.php b/src/ContextTypes/Corporation.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Corporation.php
rename to src/ContextTypes/Corporation.php
diff --git a/src/JsonLd/ContextTypes/CreativeWork.php b/src/ContextTypes/CreativeWork.php
similarity index 100%
rename from src/JsonLd/ContextTypes/CreativeWork.php
rename to src/ContextTypes/CreativeWork.php
diff --git a/src/JsonLd/ContextTypes/Duration.php b/src/ContextTypes/Duration.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Duration.php
rename to src/ContextTypes/Duration.php
diff --git a/src/JsonLd/ContextTypes/Event.php b/src/ContextTypes/Event.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Event.php
rename to src/ContextTypes/Event.php
diff --git a/src/JsonLd/ContextTypes/GeoCoordinates.php b/src/ContextTypes/GeoCoordinates.php
similarity index 100%
rename from src/JsonLd/ContextTypes/GeoCoordinates.php
rename to src/ContextTypes/GeoCoordinates.php
diff --git a/src/JsonLd/ContextTypes/ImageObject.php b/src/ContextTypes/ImageObject.php
similarity index 100%
rename from src/JsonLd/ContextTypes/ImageObject.php
rename to src/ContextTypes/ImageObject.php
diff --git a/src/JsonLd/ContextTypes/Invoice.php b/src/ContextTypes/Invoice.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Invoice.php
rename to src/ContextTypes/Invoice.php
diff --git a/src/JsonLd/ContextTypes/ListItem.php b/src/ContextTypes/ListItem.php
similarity index 100%
rename from src/JsonLd/ContextTypes/ListItem.php
rename to src/ContextTypes/ListItem.php
diff --git a/src/JsonLd/ContextTypes/LocalBusiness.php b/src/ContextTypes/LocalBusiness.php
similarity index 100%
rename from src/JsonLd/ContextTypes/LocalBusiness.php
rename to src/ContextTypes/LocalBusiness.php
diff --git a/src/JsonLd/ContextTypes/MusicAbstractContext.php b/src/ContextTypes/MusicAbstractContext.php
similarity index 100%
rename from src/JsonLd/ContextTypes/MusicAbstractContext.php
rename to src/ContextTypes/MusicAbstractContext.php
diff --git a/src/JsonLd/ContextTypes/MusicAlbum.php b/src/ContextTypes/MusicAlbum.php
similarity index 100%
rename from src/JsonLd/ContextTypes/MusicAlbum.php
rename to src/ContextTypes/MusicAlbum.php
diff --git a/src/JsonLd/ContextTypes/MusicGroup.php b/src/ContextTypes/MusicGroup.php
similarity index 100%
rename from src/JsonLd/ContextTypes/MusicGroup.php
rename to src/ContextTypes/MusicGroup.php
diff --git a/src/JsonLd/ContextTypes/MusicPlaylist.php b/src/ContextTypes/MusicPlaylist.php
similarity index 100%
rename from src/JsonLd/ContextTypes/MusicPlaylist.php
rename to src/ContextTypes/MusicPlaylist.php
diff --git a/src/JsonLd/ContextTypes/MusicRecording.php b/src/ContextTypes/MusicRecording.php
similarity index 100%
rename from src/JsonLd/ContextTypes/MusicRecording.php
rename to src/ContextTypes/MusicRecording.php
diff --git a/src/JsonLd/ContextTypes/NewsArticle.php b/src/ContextTypes/NewsArticle.php
similarity index 100%
rename from src/JsonLd/ContextTypes/NewsArticle.php
rename to src/ContextTypes/NewsArticle.php
diff --git a/src/JsonLd/ContextTypes/Offer.php b/src/ContextTypes/Offer.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Offer.php
rename to src/ContextTypes/Offer.php
diff --git a/src/JsonLd/ContextTypes/Order.php b/src/ContextTypes/Order.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Order.php
rename to src/ContextTypes/Order.php
diff --git a/src/JsonLd/ContextTypes/Organization.php b/src/ContextTypes/Organization.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Organization.php
rename to src/ContextTypes/Organization.php
diff --git a/src/JsonLd/ContextTypes/Person.php b/src/ContextTypes/Person.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Person.php
rename to src/ContextTypes/Person.php
diff --git a/src/JsonLd/ContextTypes/Place.php b/src/ContextTypes/Place.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Place.php
rename to src/ContextTypes/Place.php
diff --git a/src/JsonLd/ContextTypes/PostalAddress.php b/src/ContextTypes/PostalAddress.php
similarity index 100%
rename from src/JsonLd/ContextTypes/PostalAddress.php
rename to src/ContextTypes/PostalAddress.php
diff --git a/src/JsonLd/ContextTypes/PriceSpecification.php b/src/ContextTypes/PriceSpecification.php
similarity index 100%
rename from src/JsonLd/ContextTypes/PriceSpecification.php
rename to src/ContextTypes/PriceSpecification.php
diff --git a/src/JsonLd/ContextTypes/Product.php b/src/ContextTypes/Product.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Product.php
rename to src/ContextTypes/Product.php
diff --git a/src/JsonLd/ContextTypes/Rating.php b/src/ContextTypes/Rating.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Rating.php
rename to src/ContextTypes/Rating.php
diff --git a/src/JsonLd/ContextTypes/Review.php b/src/ContextTypes/Review.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Review.php
rename to src/ContextTypes/Review.php
diff --git a/src/JsonLd/ContextTypes/SearchBox.php b/src/ContextTypes/SearchBox.php
similarity index 100%
rename from src/JsonLd/ContextTypes/SearchBox.php
rename to src/ContextTypes/SearchBox.php
diff --git a/src/JsonLd/ContextTypes/Thing.php b/src/ContextTypes/Thing.php
similarity index 100%
rename from src/JsonLd/ContextTypes/Thing.php
rename to src/ContextTypes/Thing.php
diff --git a/src/JsonLd/ContextTypes/VideoObject.php b/src/ContextTypes/VideoObject.php
similarity index 100%
rename from src/JsonLd/ContextTypes/VideoObject.php
rename to src/ContextTypes/VideoObject.php
diff --git a/src/JsonLd/ContextTypes/WebPage.php b/src/ContextTypes/WebPage.php
similarity index 100%
rename from src/JsonLd/ContextTypes/WebPage.php
rename to src/ContextTypes/WebPage.php
diff --git a/src/JsonLd/Contracts/ContextTypeInterface.php b/src/Contracts/ContextTypeInterface.php
similarity index 100%
rename from src/JsonLd/Contracts/ContextTypeInterface.php
rename to src/Contracts/ContextTypeInterface.php