diff --git a/pi1/class.tx_veguestbook_pi1.php b/Classes/Pi1.php
similarity index 99%
rename from pi1/class.tx_veguestbook_pi1.php
rename to Classes/Pi1.php
index 04ef4c1..91cae1a 100644
--- a/pi1/class.tx_veguestbook_pi1.php
+++ b/Classes/Pi1.php
@@ -1,4 +1,6 @@
 <?php
+namespace Simonschaufi\VeGuestbook;
+
 /***************************************************************
  * Copyright notice
  *
@@ -39,10 +41,11 @@
  * @package TYPO3
  * @subpackage ve_guestbook
  */
-class tx_veguestbook_pi1 extends AbstractPlugin
+class Pi1 extends AbstractPlugin
 {
     public $prefixId = 'tx_veguestbook_pi1'; // Same as class name
-    public $scriptRelPath = 'pi1/class.tx_veguestbook_pi1.php'; // Path to this script relative to the extension dir.
+    // @TODO find proper solution to load the correct language file
+    public $scriptRelPath = 'pi1/dummypathforlanguagefile.php'; // Path to this script relative to the extension dir.
     public $extKey = 've_guestbook'; // The extension key.
 
     /**
diff --git a/composer.json b/composer.json
index 991600f..bd0955a 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 	],
 	"license": "GPL-2.0+",
 	"require": {
-		"typo3/cms-core": ">=7.6,<8.0"
+		"typo3/cms-core": ">=7.6,<9.0"
 	},
 	"suggest": {
 		"sjbr/sr-freecap": "~2.3"
diff --git a/ext_emconf.php b/ext_emconf.php
index 15b8f37..0032b3f 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -24,7 +24,7 @@
     'clearCacheOnLoad' => 0,
     'constraints' => [
         'depends' => [
-            'typo3' => '7.6.0 - 7.9.99',
+            'typo3' => '7.6.0 - 8.9.99',
         ],
         'conflicts' => [
         ],
diff --git a/ext_localconf.php b/ext_localconf.php
index 5c14b41..9824ae1 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -20,7 +20,18 @@
 }
 ');
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'pi1/class.tx_veguestbook_pi1.php', '_pi1', 'list_type', 0);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScriptSetup(
+    '
+plugin.tx_veguestbook_pi1 = USER_INT
+plugin.tx_veguestbook_pi1 {
+    userFunc = Simonschaufi\VeGuestbook\Pi1->main
+}
+
+tt_content.list.20.ve_guestbook_pi1 = < plugin.tx_veguestbook_pi1
+    '
+);
+
+
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript(
     $_EXTKEY,
     'setup',
diff --git a/ext_typoscript_setup.txt b/ext_typoscript_setup.txt
index 8087ef7..c4ae192 100644
--- a/ext_typoscript_setup.txt
+++ b/ext_typoscript_setup.txt
@@ -1,5 +1,4 @@
 plugin.tx_veguestbook_pi1 {
-	userFunc = tx_veguestbook_pi1->main
 	templateFile = {$plugin.tx_veguestbook_pi1.file.templateFile}
 	teasercut = 50
 	wordcut = 100