diff --git a/Configuration/TCA/tx_events_domain_model_date.php b/Configuration/TCA/tx_events_domain_model_date.php
index b29fa4f..16d7b1e 100644
--- a/Configuration/TCA/tx_events_domain_model_date.php
+++ b/Configuration/TCA/tx_events_domain_model_date.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_date',
+        'title' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_date.xlf:tx_events_domain_model_date',
         'label' => 'start',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -118,7 +118,7 @@ return [
 
         'start' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_date.start',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_date.xlf:tx_events_domain_model_date.start',
             'config' => [
                 //'dbType' => 'datetime',
                 'type' => 'input',
@@ -130,7 +130,7 @@ return [
         ],
         'end' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_date.end',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_date.xlf:tx_events_domain_model_date.end',
             'config' => [
                 //'dbType' => 'datetime',
                 'type' => 'input',
@@ -143,7 +143,7 @@ return [
 
         'event' => array(
             'exclude' => 1,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_date.event',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_date.xlf:tx_events_domain_model_date.event',
             'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
diff --git a/Configuration/TCA/tx_events_domain_model_event.php b/Configuration/TCA/tx_events_domain_model_event.php
index 50e56a7..c354a0e 100644
--- a/Configuration/TCA/tx_events_domain_model_event.php
+++ b/Configuration/TCA/tx_events_domain_model_event.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event',
+        'title' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event',
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -118,7 +118,7 @@ return [
 
         'title' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.title',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.title',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -127,7 +127,7 @@ return [
         ],
         'global_id' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.global_id',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.global_id',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -136,7 +136,7 @@ return [
         ],
         'slug' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.slug',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.slug',
             'config' => [
                 'type' => 'slug',
                 'size' => 50,
@@ -152,7 +152,7 @@ return [
         ],
         'highlight' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.highlight',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.highlight',
             'config' => [
                 'type' => 'check',
                 'items' => [
@@ -165,7 +165,7 @@ return [
         ],
         'teaser' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.teaser',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.teaser',
             'config' => [
                 'type' => 'text',
                 'cols' => 40,
@@ -175,7 +175,7 @@ return [
         ],
         'details' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.details',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.details',
             'config' => [
                 'type' => 'text',
                 'enableRichtext' => true,
@@ -193,7 +193,7 @@ return [
         ],
         'price_info' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.price_info',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.price_info',
             'config' => [
                 'type' => 'text',
                 'cols' => 40,
@@ -203,7 +203,7 @@ return [
         ],
         'name' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.name',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.name',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -212,7 +212,7 @@ return [
         ],
         'street' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.street',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.street',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -221,7 +221,7 @@ return [
         ],
         'district' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.district',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.district',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -230,7 +230,7 @@ return [
         ],
         'city' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.city',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.city',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -239,7 +239,7 @@ return [
         ],
         'zip' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.zip',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.zip',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -248,7 +248,7 @@ return [
         ],
         'country' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.country',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.country',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -257,7 +257,7 @@ return [
         ],
         'phone' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.phone',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.phone',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -266,7 +266,7 @@ return [
         ],
         'web' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.web',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.web',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -275,7 +275,7 @@ return [
         ],
         'ticket' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.ticket',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.ticket',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -284,7 +284,7 @@ return [
         ],
         'facebook' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.facebook',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.facebook',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -293,7 +293,7 @@ return [
         ],
         'youtube' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.youtube',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.youtube',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -302,7 +302,7 @@ return [
         ],
         'instagram' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.instagram',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.instagram',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -311,7 +311,7 @@ return [
         ],
         'latitude' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.latitude',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.latitude',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -320,7 +320,7 @@ return [
         ],
         'longitude' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.longitude',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.longitude',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -329,7 +329,7 @@ return [
         ],
         'images' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.images',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.images',
             'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig(
                 'images',
                 [
@@ -385,7 +385,7 @@ return [
 
         'categories' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.categories',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.categories',
             'config' => [
                 'type' => 'input',
                 'size' => 4,
@@ -395,7 +395,7 @@ return [
 
         'dates' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.dates',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.dates',
             'config' => [
                 'type' => 'inline',
                 'foreign_table' => 'tx_events_domain_model_date',
@@ -427,7 +427,7 @@ return [
 
         'organizer' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.organizer',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.organizer',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -438,7 +438,7 @@ return [
         ],
         'region' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_event.region',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_event.xlf:tx_events_domain_model_event.region',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
diff --git a/Configuration/TCA/tx_events_domain_model_organizer.php b/Configuration/TCA/tx_events_domain_model_organizer.php
index 319492e..4cf94db 100644
--- a/Configuration/TCA/tx_events_domain_model_organizer.php
+++ b/Configuration/TCA/tx_events_domain_model_organizer.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_organizer',
+        'title' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_organizer.xlf:tx_events_domain_model_organizer',
         'label' => 'name',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -118,7 +118,7 @@ return [
 
         'name' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_organizer.name',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_organizer.xlf:tx_events_domain_model_organizer.name',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -127,7 +127,7 @@ return [
         ],
         'street' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_organizer.street',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_organizer.xlf:tx_events_domain_model_organizer.street',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -136,7 +136,7 @@ return [
         ],
         'district' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_organizer.district',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_organizer.xlf:tx_events_domain_model_organizer.district',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -145,7 +145,7 @@ return [
         ],
         'city' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_organizer.city',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_organizer.xlf:tx_events_domain_model_organizer.city',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -154,7 +154,7 @@ return [
         ],
         'zip' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_organizer.zip',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_organizer.xlf:tx_events_domain_model_organizer.zip',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -163,7 +163,7 @@ return [
         ],
         'phone' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_organizer.phone',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_organizer.xlf:tx_events_domain_model_organizer.phone',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -172,7 +172,7 @@ return [
         ],
         'web' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_organizer.web',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_organizer.xlf:tx_events_domain_model_organizer.web',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -181,7 +181,7 @@ return [
         ],
         'email' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_organizer.email',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_organizer.xlf:tx_events_domain_model_organizer.email',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
diff --git a/Configuration/TCA/tx_events_domain_model_region.php b/Configuration/TCA/tx_events_domain_model_region.php
index afea5fe..8593f67 100644
--- a/Configuration/TCA/tx_events_domain_model_region.php
+++ b/Configuration/TCA/tx_events_domain_model_region.php
@@ -118,7 +118,7 @@ return [
 
         'title' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events_domain_model_region.title',
+            'label' => 'LLL:EXT:events/Resources/Private/Language/locallang_csh_region.xlf:tx_events_domain_model_region.title',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index 054606b..794ee72 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -1,166 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="events">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
 		<header/>
 		<body>
-			<trans-unit id="tx_events_domain_model_event">
-				<source>Event</source>
-				<target>Veranstaltung</target>
+			<trans-unit id="tx_events.searchform">
+				<source>Search form</source>
+				<target>Suchformular</target>
 			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.title">
-				<source>Title</source>
-				<target>Titel</target>
+			<trans-unit id="tx_events.searchform.regions">
+				<source>All regions</source>
+				<target>Alle Regionen</target>
 			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.global_id">
-				<source>Global UID</source>
-				<target>Globale UID</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.slug">
-				<source>Slug</source>
-				<target>URL-Segment</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.highlight">
-				<source>Highlight</source>
-				<target>Höhepunkt</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.teaser">
-				<source>Teaser</source>
-				<target>Kurztext</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.details">
-				<source>Details</source>
-				<target>Text</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.price_info">
-				<source>Price Info</source>
-				<target>Preis Information</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.name">
-				<source>Name</source>
-				<target>Name</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.street">
-				<source>Street</source>
-				<target>Straße</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.district">
-				<source>District</source>
-				<target>Bundesland</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.city">
-				<source>City</source>
-				<target>Stadt</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.zip">
-				<source>Zip</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.country">
-				<source>Country</source>
-				<target>Land</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.web">
-				<source>Web</source>
-				<target>Internet</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.phone">
-				<source>Phone</source>
-				<target>Telefon</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.ticket">
-				<source>Ticket</source>
-				<target>Ticket</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.facebook">
-				<source>Facebook</source>
-				<target>Facebook</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.youtube">
-				<source>YouTube</source>
-				<target>YouTube</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.latitude">
-				<source>Latitude</source>
-				<target>Breitengrad</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.longitude">
-				<source>Longitude</source>
-				<target>Längengrad</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.images">
-				<source>Images</source>
-				<target>Bilder</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.categories">
-				<source>Categories</source>
-				<target>Kategorien</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.dates">
-				<source>Dates</source>
-				<target>Termine</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.organizer">
-				<source>Organizer</source>
-				<target>Organisator</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.region">
-				<source>Region</source>
-				<target>Region</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer">
-				<source>Organizer</source>
-				<target>Organisator</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.name">
-				<source>Name</source>
-				<target>Name</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.street">
-				<source>Street</source>
-				<target>Straße</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.district">
-				<source>District</source>
-				<target>Bundesland</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.city">
-				<source>City</source>
-				<target>Stadt</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.zip">
-				<source>Zip</source>
-				<target>Postleitzahl</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.phone">
-				<source>Phone</source>
-				<target>Telefon</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.web">
-				<source>Web</source>
-				<target>Internet</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.email">
-				<source>E-Mail</source>
-				<target>E-Mail</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date">
-				<source>Date</source>
-				<target>Termin</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.start">
-				<source>Start</source>
-				<target>Beginn</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.end">
-				<source>End</source>
-				<target>Ende</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_region">
-				<source>Region</source>
-				<target>Bundesland</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_region.title">
-				<source>Title</source>
-				<target>Titel</target>
+			<trans-unit id="tx_events.searchform.search">
+				<source>Search</source>
+				<target>Suche</target>
 			</trans-unit>
 		</body>
 	</file>
diff --git a/Resources/Private/Language/de.locallang_csh_date.xlf b/Resources/Private/Language/de.locallang_csh_date.xlf
new file mode 100644
index 0000000..f52c5ef
--- /dev/null
+++ b/Resources/Private/Language/de.locallang_csh_date.xlf
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
+		<header/>
+		<body>
+			<trans-unit id="tx_events_domain_model_date">
+				<source>Date</source>
+				<target>Termin</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_date.start">
+				<source>Start</source>
+				<target>Beginn</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_date.end">
+				<source>End</source>
+				<target>Ende</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_date.event">
+				<source>Associated event</source>
+				<target>Verknüpfte Veranstaltungen</target>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/Resources/Private/Language/de.locallang_csh_event.xlf b/Resources/Private/Language/de.locallang_csh_event.xlf
new file mode 100644
index 0000000..0b8d472
--- /dev/null
+++ b/Resources/Private/Language/de.locallang_csh_event.xlf
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
+		<header/>
+		<body>
+			<trans-unit id="tx_events.name">
+				<source>Events</source>
+				<target>Veranstaltungen</target>
+			</trans-unit>
+			<trans-unit id="tx_events.description">
+				<source>Event Modul</source>
+				<target>Veranstaltungs Modul</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event">
+				<source>Event</source>
+				<target>Veranstaltung</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.title">
+				<source>Title</source>
+				<target>Titel</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.global_id">
+				<source>Global UID</source>
+				<target>Globale UID</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.slug">
+				<source>Slug</source>
+				<target>URL-Segment</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.highlight">
+				<source>Highlight</source>
+				<target>Höhepunkt</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.teaser">
+				<source>Teaser</source>
+				<target>Kurztext</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.details">
+				<source>Details</source>
+				<target>Text</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.price_info">
+				<source>Price Info</source>
+				<target>Preis Information</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.name">
+				<source>Name</source>
+				<target>Name</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.street">
+				<source>Street</source>
+				<target>Straße</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.district">
+				<source>District</source>
+				<target>Bundesland</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.city">
+				<source>City</source>
+				<target>Stadt</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.zip">
+				<source>Zip</source>
+				<target>Postleitzahl</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.country">
+				<source>Country</source>
+				<target>Land</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.web">
+				<source>Web</source>
+				<target>Internet</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.phone">
+				<source>Phone</source>
+				<target>Telefon</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.ticket">
+				<source>Ticket</source>
+				<target>Ticket</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.facebook">
+				<source>Facebook</source>
+				<target>Facebook</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.youtube">
+				<source>YouTube</source>
+				<target>YouTube</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.instagram">
+				<source>Instagram</source>
+				<target>Instagram</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.latitude">
+				<source>Latitude</source>
+				<target>Breitengrad</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.longitude">
+				<source>Longitude</source>
+				<target>Längengrad</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.images">
+				<source>Images</source>
+				<target>Bilder</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.categories">
+				<source>Categories</source>
+				<target>Kategorien</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.dates">
+				<source>Dates</source>
+				<target>Termine</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.organizer">
+				<source>Organizer</source>
+				<target>Organisator</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.region">
+				<source>Region</source>
+				<target>Region</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer">
+				<source>Organizer</source>
+				<target>Organisator</target>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/Resources/Private/Language/de.locallang_csh_organizer.xlf b/Resources/Private/Language/de.locallang_csh_organizer.xlf
new file mode 100644
index 0000000..4703dbc
--- /dev/null
+++ b/Resources/Private/Language/de.locallang_csh_organizer.xlf
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
+		<header/>
+		<body>
+<trans-unit id="tx_events_domain_model_organizer">
+				<source>Organizer</source>
+				<target>Organisator</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.name">
+				<source>Name</source>
+				<target>Name</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.street">
+				<source>Street</source>
+				<target>Straße</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.district">
+				<source>District</source>
+				<target>Bundesland</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.city">
+				<source>City</source>
+				<target>Stadt</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.zip">
+				<source>Zip</source>
+				<target>Postleitzahl</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.phone">
+				<source>Phone</source>
+				<target>Telefon</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.web">
+				<source>Web</source>
+				<target>Internet</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.email">
+				<source>E-Mail</source>
+				<target>E-Mail</target>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/Resources/Private/Language/de.locallang_csh_region.xlf b/Resources/Private/Language/de.locallang_csh_region.xlf
new file mode 100644
index 0000000..4c1c1f3
--- /dev/null
+++ b/Resources/Private/Language/de.locallang_csh_region.xlf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
+		<header/>
+		<body>
+			<trans-unit id="tx_events_domain_model_region">
+				<source>Region</source>
+				<target>Region</target>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_region.title">
+				<source>Title</source>
+				<target>Titel</target>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
index 55c2736..468831a 100644
--- a/Resources/Private/Language/de.locallang_db.xlf
+++ b/Resources/Private/Language/de.locallang_db.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="dd_events">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
 		<header/>
 		<body>
 			<trans-unit id="tx_events.name">
@@ -11,174 +11,6 @@
 				<source>Event Modul</source>
 				<target>Veranstaltungs Modul</target>
 			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event">
-				<source>Event</source>
-				<target>Veranstaltung</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.title">
-				<source>Title</source>
-				<target>Titel</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.global_id">
-				<source>Global UID</source>
-				<target>Globale UID</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.slug">
-				<source>Slug</source>
-				<target>URL-Segment</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.highlight">
-				<source>Highlight</source>
-				<target>Höhepunkt</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.teaser">
-				<source>Teaser</source>
-				<target>Kurztext</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.details">
-				<source>Details</source>
-				<target>Text</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.price_info">
-				<source>Price Info</source>
-				<target>Preis Information</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.name">
-				<source>Name</source>
-				<target>Name</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.street">
-				<source>Street</source>
-				<target>Straße</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.district">
-				<source>District</source>
-				<target>Bundesland</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.city">
-				<source>City</source>
-				<target>Stadt</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.zip">
-				<source>Zip</source>
-				<target>Postleitzahl</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.country">
-				<source>Country</source>
-				<target>Land</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.web">
-				<source>Web</source>
-				<target>Internet</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.phone">
-				<source>Phone</source>
-				<target>Telefon</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.ticket">
-				<source>Ticket</source>
-				<target>Ticket</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.facebook">
-				<source>Facebook</source>
-				<target>Facebook</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.youtube">
-				<source>YouTube</source>
-				<target>YouTube</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.instagram">
-				<source>Instagram</source>
-				<target>Instagram</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.latitude">
-				<source>Latitude</source>
-				<target>Breitengrad</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.longitude">
-				<source>Longitude</source>
-				<target>Längengrad</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.images">
-				<source>Images</source>
-				<target>Bilder</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.categories">
-				<source>Categories</source>
-				<target>Kategorien</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.dates">
-				<source>Dates</source>
-				<target>Termine</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.organizer">
-				<source>Organizer</source>
-				<target>Organisator</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.region">
-				<source>Region</source>
-				<target>Region</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer">
-				<source>Organizer</source>
-				<target>Organisator</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.name">
-				<source>Name</source>
-				<target>Name</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.street">
-				<source>Street</source>
-				<target>Straße</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.district">
-				<source>District</source>
-				<target>Bundesland</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.city">
-				<source>City</source>
-				<target>Stadt</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.zip">
-				<source>Zip</source>
-				<target>Postleitzahl</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.phone">
-				<source>Phone</source>
-				<target>Telefon</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.web">
-				<source>Web</source>
-				<target>Internet</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.email">
-				<source>E-Mail</source>
-				<target>E-Mail</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date">
-				<source>Date</source>
-				<target>Termin</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.start">
-				<source>Start</source>
-				<target>Beginn</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.end">
-				<source>End</source>
-				<target>Ende</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.event">
-				<source>Associated event</source>
-				<target>Verknüpfte Veranstaltungen</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_region">
-				<source>Region</source>
-				<target>Region</target>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_region.title">
-				<source>Title</source>
-				<target>Titel</target>
-			</trans-unit>
 		</body>
 	</file>
 </xliff>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index eaaf9dd..bee8485 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -1,130 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="events">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
 		<header/>
 		<body>
-			<trans-unit id="tx_events_domain_model_event">
-				<source>Event</source>
+			<trans-unit id="tx_events.searchform">
+				<source>Search form</source>
 			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.title">
-				<source>Title</source>
+			<trans-unit id="tx_events.searchform.regions">
+				<source>All regions</source>
 			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.global_id">
-				<source>Global UID</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.slug">
-				<source>Slug</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.highlight">
-				<source>Highlight</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.teaser">
-				<source>Teaser</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.details">
-				<source>Details</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.price_info">
-				<source>Price Info</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.name">
-				<source>Name</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.street">
-				<source>Street</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.district">
-				<source>District</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.city">
-				<source>City</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.zip">
-				<source>Zip</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.country">
-				<source>Country</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.web">
-				<source>Web</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.phone">
-				<source>Phone</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.booking">
-				<source>Booking</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.ticket">
-				<source>Ticket</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.facebook">
-				<source>Facebook</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.youtube">
-				<source>YouTube</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.latitude">
-				<source>Latitude</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.longitude">
-				<source>Longitude</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.images">
-				<source>Images</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.categories">
-				<source>Categories</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.dates">
-				<source>Dates</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.organizer">
-				<source>Organizer</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.region">
-				<source>Region</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer">
-				<source>Organizer</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.name">
-				<source>Name</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.street">
-				<source>Street</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.district">
-				<source>District</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.city">
-				<source>City</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.zip">
-				<source>Zip</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.phone">
-				<source>Phone</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.web">
-				<source>Web</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.email">
-				<source>E-Mail</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date">
-				<source>Date</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.start">
-				<source>Start</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.end">
-				<source>End</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_region">
-				<source>Region</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_region.title">
-				<source>Title</source>
+			<trans-unit id="tx_events.searchform.search">
+				<source>Search</source>
 			</trans-unit>
 		</body>
 	</file>
diff --git a/Resources/Private/Language/locallang_csh_date.xlf b/Resources/Private/Language/locallang_csh_date.xlf
new file mode 100644
index 0000000..3270004
--- /dev/null
+++ b/Resources/Private/Language/locallang_csh_date.xlf
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
+		<header/>
+		<body>
+			<trans-unit id="tx_events_domain_model_date">
+				<source>Date</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_date.start">
+				<source>Start</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_date.end">
+				<source>End</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_date.event">
+				<source>Associated event</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/Resources/Private/Language/locallang_csh_event.xlf b/Resources/Private/Language/locallang_csh_event.xlf
new file mode 100644
index 0000000..6608918
--- /dev/null
+++ b/Resources/Private/Language/locallang_csh_event.xlf
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
+		<header/>
+		<body>
+			<trans-unit id="tx_events.name">
+				<source>Events</source>
+			</trans-unit>
+			<trans-unit id="tx_events.description">
+				<source>Event Modul</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event">
+				<source>Event</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.title">
+				<source>Title</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.global_id">
+				<source>Global UID</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.slug">
+				<source>Slug</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.highlight">
+				<source>Highlight</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.teaser">
+				<source>Teaser</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.details">
+				<source>Details</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.price_info">
+				<source>Price Info</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.name">
+				<source>Name</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.street">
+				<source>Street</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.district">
+				<source>District</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.city">
+				<source>City</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.zip">
+				<source>Zip</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.country">
+				<source>Country</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.web">
+				<source>Web</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.phone">
+				<source>Phone</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.ticket">
+				<source>Ticket</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.facebook">
+				<source>Facebook</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.youtube">
+				<source>Youtube</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.instagram">
+				<source>Instagram</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.latitude">
+				<source>Latitude</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.longitude">
+				<source>Longitude</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.images">
+				<source>Images</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.categories">
+				<source>Categories</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.dates">
+				<source>Dates</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.organizer">
+				<source>Organizer</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_event.region">
+				<source>Region</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/Resources/Private/Language/locallang_csh_organizer.xlf b/Resources/Private/Language/locallang_csh_organizer.xlf
new file mode 100644
index 0000000..0187dab
--- /dev/null
+++ b/Resources/Private/Language/locallang_csh_organizer.xlf
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
+		<header/>
+		<body>
+			<trans-unit id="tx_events_domain_model_organizer">
+				<source>Organizer</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.name">
+				<source>Name</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.street">
+				<source>Street</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.district">
+				<source>District</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.city">
+				<source>City</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.zip">
+				<source>Zip</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.phone">
+				<source>Phone</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.web">
+				<source>Web</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_organizer.email">
+				<source>E-Mail</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/Resources/Private/Language/locallang_csh_tx_events_domain_model_region.xlf b/Resources/Private/Language/locallang_csh_region.xlf
similarity index 52%
rename from Resources/Private/Language/locallang_csh_tx_events_domain_model_region.xlf
rename to Resources/Private/Language/locallang_csh_region.xlf
index 55570f5..48fd713 100644
--- a/Resources/Private/Language/locallang_csh_tx_events_domain_model_region.xlf
+++ b/Resources/Private/Language/locallang_csh_region.xlf
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="dd_events">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
 		<header/>
 		<body>
-			<trans-unit id="title.description">
+			<trans-unit id="tx_events_domain_model_region">
+				<source>Region</source>
+			</trans-unit>
+			<trans-unit id="tx_events_domain_model_region.title">
 				<source>Title</source>
 			</trans-unit>
 		</body>
diff --git a/Resources/Private/Language/locallang_csh_tx_events_domain_model_date.xlf b/Resources/Private/Language/locallang_csh_tx_events_domain_model_date.xlf
deleted file mode 100644
index 77b6ad7..0000000
--- a/Resources/Private/Language/locallang_csh_tx_events_domain_model_date.xlf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="dd_events">
-		<header/>
-		<body>
-			<trans-unit id="start.description">
-				<source>Start</source>
-			</trans-unit>
-			<trans-unit id="end.description">
-				<source>End</source>
-			</trans-unit>
-		</body>
-	</file>
-</xliff>
diff --git a/Resources/Private/Language/locallang_csh_tx_events_domain_model_event.xlf b/Resources/Private/Language/locallang_csh_tx_events_domain_model_event.xlf
deleted file mode 100644
index 6471105..0000000
--- a/Resources/Private/Language/locallang_csh_tx_events_domain_model_event.xlf
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="dd_events">
-		<header/>
-		<body>
-			<trans-unit id="title.description">
-				<source>Title</source>
-			</trans-unit>
-			<trans-unit id="global_id.description">
-				<source>Global UID</source>
-			</trans-unit>
-			<trans-unit id="slug.description">
-				<source>Slug</source>
-			</trans-unit>
-			<trans-unit id="highlight.description">
-				<source>Highlight</source>
-			</trans-unit>
-			<trans-unit id="teaser.description">
-				<source>Teaser</source>
-			</trans-unit>
-			<trans-unit id="details.description">
-				<source>Details</source>
-			</trans-unit>
-			<trans-unit id="price_info.description">
-				<source>Price info</source>
-			</trans-unit>
-			<trans-unit id="name.description">
-				<source>Name</source>
-			</trans-unit>
-			<trans-unit id="street.description">
-				<source>Street</source>
-			</trans-unit>
-			<trans-unit id="district.description">
-				<source>District</source>
-			</trans-unit>
-			<trans-unit id="city.description">
-				<source>City</source>
-			</trans-unit>
-			<trans-unit id="zip.description">
-				<source>Zip</source>
-			</trans-unit>
-			<trans-unit id="country.description">
-				<source>Country</source>
-			</trans-unit>
-			<trans-unit id="web.description">
-				<source>Web</source>
-			</trans-unit>
-			<trans-unit id="ticket.description">
-				<source>Ticket</source>
-			</trans-unit>
-			<trans-unit id="facebook.description">
-				<source>Facebook</source>
-			</trans-unit>
-			<trans-unit id="youtube.description">
-				<source>YouTube</source>
-			</trans-unit>
-			<trans-unit id="latitude.description">
-				<source>Latitude</source>
-			</trans-unit>
-			<trans-unit id="longitude.description">
-				<source>Longitude</source>
-			</trans-unit>
-			<trans-unit id="images.description">
-				<source>Images</source>
-			</trans-unit>
-			<trans-unit id="categories.description">
-				<source>Categories</source>
-			</trans-unit>
-			<trans-unit id="dates.description">
-				<source>Dates</source>
-			</trans-unit>
-			<trans-unit id="organizer.description">
-				<source>Organizer</source>
-			</trans-unit>
-			<trans-unit id="region.description">
-				<source>Region</source>
-			</trans-unit>
-		</body>
-	</file>
-</xliff>
diff --git a/Resources/Private/Language/locallang_csh_tx_events_domain_model_events.xlf b/Resources/Private/Language/locallang_csh_tx_events_domain_model_events.xlf
deleted file mode 100644
index 9eca956..0000000
--- a/Resources/Private/Language/locallang_csh_tx_events_domain_model_events.xlf
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-01T16:05:42Z" product-name="dd_events">
-		<header/>
-		<body>
-			<trans-unit id="global_id.description">
-				<source>Global UID</source>
-			</trans-unit>
-			<trans-unit id="title.description">
-				<source>Title</source>
-			</trans-unit>
-			<trans-unit id="teaser.description">
-				<source>Teaser</source>
-			</trans-unit>
-			<trans-unit id="details.description">
-				<source>Details</source>
-			</trans-unit>
-			<trans-unit id="price_info.description">
-				<source>Price info</source>
-			</trans-unit>
-			<trans-unit id="street.description">
-				<source>Street</source>
-			</trans-unit>
-			<trans-unit id="district.description">
-				<source>District</source>
-			</trans-unit>
-			<trans-unit id="city.description">
-				<source>City</source>
-			</trans-unit>
-			<trans-unit id="zip.description">
-				<source>Zip</source>
-			</trans-unit>
-			<trans-unit id="web.description">
-				<source>Web</source>
-			</trans-unit>
-			<trans-unit id="ticket.description">
-				<source>Ticket</source>
-			</trans-unit>
-			<trans-unit id="facebook.description">
-				<source>Facebook</source>
-			</trans-unit>
-			<trans-unit id="youtube.description">
-				<source>YouTube</source>
-			</trans-unit>
-			<trans-unit id="latitude.description">
-				<source>Latitude</source>
-			</trans-unit>
-			<trans-unit id="longitude.description">
-				<source>Longitude</source>
-			</trans-unit>
-			<trans-unit id="images.description">
-				<source>Images</source>
-			</trans-unit>
-			<trans-unit id="slug.description">
-				<source>Slug</source>
-			</trans-unit>
-			<trans-unit id="organizer.description">
-				<source>Organizer</source>
-			</trans-unit>
-			<trans-unit id="date.description">
-				<source>Date</source>
-			</trans-unit>
-			<trans-unit id="region.description">
-				<source>Region</source>
-			</trans-unit>
-		</body>
-	</file>
-</xliff>
diff --git a/Resources/Private/Language/locallang_csh_tx_events_domain_model_organizer.xlf b/Resources/Private/Language/locallang_csh_tx_events_domain_model_organizer.xlf
deleted file mode 100644
index 24beaca..0000000
--- a/Resources/Private/Language/locallang_csh_tx_events_domain_model_organizer.xlf
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="dd_events">
-		<header/>
-		<body>
-			<trans-unit id="name.description">
-				<source>Name</source>
-			</trans-unit>
-			<trans-unit id="street.description">
-				<source>Street</source>
-			</trans-unit>
-			<trans-unit id="district.description">
-				<source>District</source>
-			</trans-unit>
-			<trans-unit id="city.description">
-				<source>City</source>
-			</trans-unit>
-			<trans-unit id="zip.description">
-				<source>Zip</source>
-			</trans-unit>
-			<trans-unit id="phone.description">
-				<source>Phone</source>
-			</trans-unit>
-			<trans-unit id="web.description">
-				<source>Web</source>
-			</trans-unit>
-			<trans-unit id="email.description">
-				<source>E-Mail</source>
-			</trans-unit>
-		</body>
-	</file>
-</xliff>
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index 3cb0ac3..9462876 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="dd_events">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-04-03T12:11:11Z" product-name="tx_events">
 		<header/>
 		<body>
 			<trans-unit id="tx_events.name">
@@ -9,132 +9,6 @@
 			<trans-unit id="tx_events.description">
 				<source>Event Modul</source>
 			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event">
-				<source>Event</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.title">
-				<source>Title</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.global_id">
-				<source>Global UID</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.slug">
-				<source>Slug</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.highlight">
-				<source>Highlight</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.teaser">
-				<source>Teaser</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.details">
-				<source>Details</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.price_info">
-				<source>Price Info</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.name">
-				<source>Name</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.street">
-				<source>Street</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.district">
-				<source>District</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.city">
-				<source>City</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.zip">
-				<source>Zip</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.country">
-				<source>Country</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.web">
-				<source>Web</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.phone">
-				<source>Phone</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.ticket">
-				<source>Ticket</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.facebook">
-				<source>Facebook</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.youtube">
-				<source>Youtube</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.instagram">
-				<source>Instagram</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.latitude">
-				<source>Latitude</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.longitude">
-				<source>Longitude</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.images">
-				<source>Images</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.categories">
-				<source>Categories</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.dates">
-				<source>Dates</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.organizer">
-				<source>Organizer</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_event.region">
-				<source>Region</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer">
-				<source>Organizer</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.name">
-				<source>Name</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.street">
-				<source>Street</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.district">
-				<source>District</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.city">
-				<source>City</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.zip">
-				<source>Zip</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.phone">
-				<source>Phone</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.web">
-				<source>Web</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_organizer.email">
-				<source>E-Mail</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date">
-				<source>Date</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.start">
-				<source>Start</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.end">
-				<source>End</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_date.event">
-				<source>Associated event</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_region">
-				<source>Region</source>
-			</trans-unit>
-			<trans-unit id="tx_events_domain_model_region.title">
-				<source>Title</source>
-			</trans-unit>
 		</body>
 	</file>
 </xliff>