diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5657f6e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vendor
\ No newline at end of file
diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
new file mode 100644
index 0000000..e69de29
diff --git a/LICENCE.md b/LICENCE.md
new file mode 100644
index 0000000..d68943e
--- /dev/null
+++ b/LICENCE.md
@@ -0,0 +1,19 @@
+# MIT license
+
+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.
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/classes/Event.php b/classes/EventEntity.php
similarity index 98%
rename from classes/Event.php
rename to classes/EventEntity.php
index 618193c..aa5cd87 100644
--- a/classes/Event.php
+++ b/classes/EventEntity.php
@@ -1,6 +1,6 @@
 <?php namespace NicoSt\GCalendar\Classes;
 
-class Event {
+class EventEntity {
 
     var $calendar_name;
     var $event_name;
diff --git a/components/EmbeddedCalendar.php b/components/EmbeddedCalendar.php
index d216fca..f254507 100644
--- a/components/EmbeddedCalendar.php
+++ b/components/EmbeddedCalendar.php
@@ -1,7 +1,6 @@
 <?php namespace NicoSt\GCalendar\Components;
 
 use Cms\Classes\ComponentBase;
-use NicoSt\GCalendar\Classes\Event;
 use NicoSt\GCalendar\Classes\GoogleCalendarService;
 use Mobile_Detect;
 
diff --git a/components/Upcoming.php b/components/Upcoming.php
index 6bcf9af..148ff38 100644
--- a/components/Upcoming.php
+++ b/components/Upcoming.php
@@ -1,7 +1,7 @@
 <?php namespace NicoSt\GCalendar\Components;
 
 use Cms\Classes\ComponentBase;
-use NicoSt\GCalendar\Classes\Event;
+use NicoSt\GCalendar\Classes\EventEntity;
 use NicoSt\GCalendar\Classes\GoogleCalendarService;
 use NicoSt\GCalendar\Models\Settings;
 
@@ -26,7 +26,8 @@ class Upcoming extends ComponentBase {
 
         return $connector->calendarList();
     }
-*/
+    */
+    
     public function defineProperties() {
         return [
             'maxEvents' => [
@@ -67,7 +68,7 @@ class Upcoming extends ComponentBase {
         foreach ($calendarEvents as $calendarEvent) {
             foreach ($calendarEvent as $event) {
                 // Map to data response object.
-                $eventObject = new Event();
+                $eventObject = new EventEntity();
                 $eventObject->setCalendarName($calendarEvent->summary);
                 $eventObject->setEventName($event->summary);
                 $eventObject->setLocation($event->location);
diff --git a/composer.json b/composer.json
index 3ee7c53..be02a94 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,9 @@
 {
-  "name": "nicost/gcalendar",
+  "name": "nicost/oc-gcalendar-plugin",
   "type": "october-plugin",
-  "description": "Calendar plugin which uses the Google Calendar API. Provides a component to show the next upcoming events from google calendars.",
+  "description": "OctoberCMS calendar plugin which uses the Google Calendar API to provide event data.",
   "keywords": ["october", "cms", "google", "calendar", "events", "schedule", "kalender"],
+  "license": "MIT",
   "authors": [
     {
       "name": "Nico Störzbach"