diff --git a/config/sites/restaurant/constant.typoscript b/config/sites/restaurant/constant.typoscript
deleted file mode 100644
index 4d82736..0000000
--- a/config/sites/restaurant/constant.typoscript
+++ /dev/null
@@ -1 +0,0 @@
-@import 'EXT:restaurant/Configuration/TypoScript/Page/*.typoscript'
diff --git a/config/sites/restaurant/setup.typoscript b/config/sites/restaurant/setup.typoscript
deleted file mode 100644
index f5a2c49..0000000
--- a/config/sites/restaurant/setup.typoscript
+++ /dev/null
@@ -1 +0,0 @@
-@import 'EXT:restaurant/Configuration/TypoScript/*.typoscript'
diff --git a/local_packages/restaurant/Configuration/TypoScript/Page/Default.typoscript b/local_packages/restaurant/Configuration/Sets/Restaurant/TypoScript/Page/Default.typoscript
similarity index 100%
rename from local_packages/restaurant/Configuration/TypoScript/Page/Default.typoscript
rename to local_packages/restaurant/Configuration/Sets/Restaurant/TypoScript/Page/Default.typoscript
diff --git a/local_packages/restaurant/Configuration/Sets/Restaurant/config.yaml b/local_packages/restaurant/Configuration/Sets/Restaurant/config.yaml
index f0052ab..4dc18f7 100644
--- a/local_packages/restaurant/Configuration/Sets/Restaurant/config.yaml
+++ b/local_packages/restaurant/Configuration/Sets/Restaurant/config.yaml
@@ -1,5 +1,2 @@
 name: surfcamp/restaurant
 label: Restaurant
-
-dependencies:
-  - typo3/seo-xml-sitemap
diff --git a/local_packages/restaurant/Configuration/TypoScript/constants.typoscript b/local_packages/restaurant/Configuration/Sets/Restaurant/constant.typoscript
similarity index 100%
rename from local_packages/restaurant/Configuration/TypoScript/constants.typoscript
rename to local_packages/restaurant/Configuration/Sets/Restaurant/constant.typoscript
diff --git a/local_packages/restaurant/Configuration/Sets/Restaurant/setup.typoscript b/local_packages/restaurant/Configuration/Sets/Restaurant/setup.typoscript
new file mode 100644
index 0000000..59d56c8
--- /dev/null
+++ b/local_packages/restaurant/Configuration/Sets/Restaurant/setup.typoscript
@@ -0,0 +1 @@
+@import './TypoScript/Page/*.typoscript'
diff --git a/local_packages/restaurant/Configuration/TsConfig/Page/Mod/WebLayout/BackendLayouts/home.tsconfig b/local_packages/restaurant/Configuration/TsConfig/Page/Mod/WebLayout/BackendLayouts/home.tsconfig
index a060d93..0931359 100644
--- a/local_packages/restaurant/Configuration/TsConfig/Page/Mod/WebLayout/BackendLayouts/home.tsconfig
+++ b/local_packages/restaurant/Configuration/TsConfig/Page/Mod/WebLayout/BackendLayouts/home.tsconfig
@@ -1,6 +1,3 @@
-#
-# BACKENDLAYOUT: HOME
-#
 mod {
     web_layout {
         BackendLayouts {
diff --git a/local_packages/restaurant/Configuration/TypoScript/setup.typoscript b/local_packages/restaurant/Configuration/TypoScript/setup.typoscript
deleted file mode 100644
index 7947fc9..0000000
--- a/local_packages/restaurant/Configuration/TypoScript/setup.typoscript
+++ /dev/null
@@ -1 +0,0 @@
-@import 'EXT:restaurant/Configuration/TypoScript/Page/*.typoscript'
\ No newline at end of file