diff --git a/Configuration/Sets/Picture/config.yaml b/Configuration/Sets/Picture/config.yaml
new file mode 100644
index 0000000..d8978bf
--- /dev/null
+++ b/Configuration/Sets/Picture/config.yaml
@@ -0,0 +1,2 @@
+name: b13/picture
+label: Picture
\ No newline at end of file
diff --git a/Configuration/Sets/Picture/setup.typoscript b/Configuration/Sets/Picture/setup.typoscript
new file mode 100644
index 0000000..23ceba1
--- /dev/null
+++ b/Configuration/Sets/Picture/setup.typoscript
@@ -0,0 +1,32 @@
+plugin.tx_picture {
+  # Default for adding of images as webp.
+  addWebp = 0
+
+  # Default for render images as webp only.
+  onlyWebp = 0
+
+  # Default for adding retina images.
+  useRetina = 0
+
+  # Default for using lossless compression for webp.
+  lossless = 0
+
+  # Works only in combination with useRetina = 1.
+  # The key must be the multiplier of the image size and the value the multiplier string added in the srcset
+  # attribute's value. E.g. add "3 = 3x" to array:
+  # retina.2 = 2x
+  # retina.3 = 3x
+  retina {
+    2 = 2x
+  }
+
+  # Breakpoints for media query specified in the sources attribute:
+  # breakpoints {
+  #   sm = 640
+  #   md = 1024
+  #   lg = 1280
+  # }
+
+  # We use the same lazyLoading setting as is the default for the website
+  lazyLoading = {$styles.content.image.lazyLoading}
+}
diff --git a/Configuration/Sets/PictureTest/config.yaml b/Configuration/Sets/PictureTest/config.yaml
new file mode 100644
index 0000000..8a02e25
--- /dev/null
+++ b/Configuration/Sets/PictureTest/config.yaml
@@ -0,0 +1,4 @@
+name: b13/picture/test
+label: Picture Test
+dependencies:
+  - b13/picture
\ No newline at end of file
diff --git a/Configuration/Sets/PictureTest/setup.typoscript b/Configuration/Sets/PictureTest/setup.typoscript
new file mode 100644
index 0000000..262831c
--- /dev/null
+++ b/Configuration/Sets/PictureTest/setup.typoscript
@@ -0,0 +1,27 @@
+plugin.tx_picture {
+  retina {
+    2 = 2x
+    3 = 3x
+  }
+
+  breakpoints {
+    sm = 640
+    md = 1024
+    lg = 1280
+  }
+}
+
+imagetest = PAGE
+imagetest {
+    typeNum = 1573387706874
+
+    10 = FLUIDTEMPLATE
+    10.file = EXT:picture/Resources/Private/Templates/Test.html
+
+    headerData.1573465962914 = TEXT
+    headerData.1573465962914.value (
+        <style>
+            code { display: block; margin: 1em 0; }
+        </style>
+    )
+}
\ No newline at end of file
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
index 23ceba1..66c25d8 100644
--- a/Configuration/TypoScript/setup.typoscript
+++ b/Configuration/TypoScript/setup.typoscript
@@ -1,32 +1 @@
-plugin.tx_picture {
-  # Default for adding of images as webp.
-  addWebp = 0
-
-  # Default for render images as webp only.
-  onlyWebp = 0
-
-  # Default for adding retina images.
-  useRetina = 0
-
-  # Default for using lossless compression for webp.
-  lossless = 0
-
-  # Works only in combination with useRetina = 1.
-  # The key must be the multiplier of the image size and the value the multiplier string added in the srcset
-  # attribute's value. E.g. add "3 = 3x" to array:
-  # retina.2 = 2x
-  # retina.3 = 3x
-  retina {
-    2 = 2x
-  }
-
-  # Breakpoints for media query specified in the sources attribute:
-  # breakpoints {
-  #   sm = 640
-  #   md = 1024
-  #   lg = 1280
-  # }
-
-  # We use the same lazyLoading setting as is the default for the website
-  lazyLoading = {$styles.content.image.lazyLoading}
-}
+@import 'EXT:picture/Configuration/Sets/Picture/setup.typoscript'
\ No newline at end of file
diff --git a/Configuration/TypoScript/test.typoscript b/Configuration/TypoScript/test.typoscript
index 6962c80..4d041d7 100644
--- a/Configuration/TypoScript/test.typoscript
+++ b/Configuration/TypoScript/test.typoscript
@@ -1,29 +1,2 @@
-@import 'EXT:picture/Configuration/TypoScript/setup.typoscript'
-
-plugin.tx_picture {
-  retina {
-    2 = 2x
-    3 = 3x
-  }
-
-  breakpoints {
-    sm = 640
-    md = 1024
-    lg = 1280
-  }
-}
-
-imagetest = PAGE
-imagetest {
-    typeNum = 1573387706874
-
-    10 = FLUIDTEMPLATE
-    10.file = EXT:picture/Resources/Private/Templates/Test.html
-
-    headerData.1573465962914 = TEXT
-    headerData.1573465962914.value (
-        <style>
-            code { display: block; margin: 1em 0; }
-        </style>
-    )
-}
+@import 'EXT:picture/Configuration/Sets/Picture/setup.typoscript'
+@import 'EXT:picture/Configuration/Sets/PictureTest/setup.typoscript'
\ No newline at end of file