diff --git a/cypress/integration/README.md b/cypress/integration/README.md
index 04ad65606..bfc9ee2a5 100644
--- a/cypress/integration/README.md
+++ b/cypress/integration/README.md
@@ -16,6 +16,8 @@ The following features will be implemented. This gets done in three steps:
 
 ### User Account
 
+[Cucumber Features](./user_account)
+
 * Sign-up
 * Agree to Data Privacy Statement
 * Agree to Terms of Service
@@ -28,8 +30,11 @@ The following features will be implemented. This gets done in three steps:
 * Download User's Content
 * GDPR-Information about stored Content
 * Choosing Interface Language \(e.g. German / English / French\)
+* Persistent Links
 
-### User  Profile
+### User Profile
+
+[Cucumber Features](./user_profile)
 
 * Upload and Change Avatar
 * Upload and Change Profile Picture
@@ -39,7 +44,7 @@ The following features will be implemented. This gets done in three steps:
 * Show Posts of a specific User
 * Show Comments of a specific User
 
-### Cockpit
+### Dashboard
 
 [Clickdummy](https://preview.uxpin.com/24a2ab8adcd84f9a763d87ed27251351225e0ecd#/pages/99768919/simulate/sitemap?mode=i)
 
@@ -54,7 +59,10 @@ The following features will be implemented. This gets done in three steps:
 
 ### Posts
 
+[Cucumber Features](./post/)
+
 * Creating Posts
+* Persistent Links
 * Upload Teaser Picture for Post
 * Upload additional Pictures
 * Editing Title and Content
@@ -101,6 +109,8 @@ The following features will be implemented. This gets done in three steps:
 
 ### Search
 
+[Cucumber Features](./search)
+
 * Search for Categories
 * Search for Tags
 * Fulltext Search
@@ -220,6 +230,8 @@ Shows automatically related actions for existing post.
 
 ### Moderation
 
+[Cucumber Features](./moderation)
+
 * Report Button for users for doubtful Content
 * Moderator Panel
 * List of reported Content \(later replaced by User-Moderation\)
@@ -241,6 +253,13 @@ Shows automatically related actions for existing post.
 * Allow Users to register with Invite Code
 * Double-opt-in by Email
 
+### Internationalization
+
+[Cucumber Features](./internationalization)
+
+* Frontend UI
+* Backend Error Messages
+
 ### Federation
 
 * Provide Server-Server ActivityPub-API
diff --git a/cypress/integration/02.Internationalization.feature b/cypress/integration/internationalization/Internationalization.feature
similarity index 100%
rename from cypress/integration/02.Internationalization.feature
rename to cypress/integration/internationalization/Internationalization.feature
diff --git a/cypress/integration/identifier/PersistentLinks.feature b/cypress/integration/post/PersistentLinks.feature
similarity index 100%
rename from cypress/integration/identifier/PersistentLinks.feature
rename to cypress/integration/post/PersistentLinks.feature
diff --git a/cypress/integration/06.WritePost.feature b/cypress/integration/post/WritePost.feature
similarity index 100%
rename from cypress/integration/06.WritePost.feature
rename to cypress/integration/post/WritePost.feature
diff --git a/cypress/integration/06.Search.feature b/cypress/integration/search/Search.feature
similarity index 100%
rename from cypress/integration/06.Search.feature
rename to cypress/integration/search/Search.feature
diff --git a/cypress/integration/settings/ChangePassword.feature b/cypress/integration/user_account/ChangePassword.feature
similarity index 100%
rename from cypress/integration/settings/ChangePassword.feature
rename to cypress/integration/user_account/ChangePassword.feature
diff --git a/cypress/integration/01.Login.feature b/cypress/integration/user_account/Login.feature
similarity index 100%
rename from cypress/integration/01.Login.feature
rename to cypress/integration/user_account/Login.feature
diff --git a/cypress/integration/04.AboutMeAndLocation.feature b/cypress/integration/user_profile/AboutMeAndLocation.feature
similarity index 100%
rename from cypress/integration/04.AboutMeAndLocation.feature
rename to cypress/integration/user_profile/AboutMeAndLocation.feature
diff --git a/testing.md b/testing.md
index 3088fc078..2414c748f 100644
--- a/testing.md
+++ b/testing.md
@@ -1,18 +1,18 @@
 # Testing Guide
 
-## [End-to-End Testing](cypress/README.md)
+## End-to-End Testing
 
 To test all the pieces together, from the user perspective, we use integration tests. They also show if the the backend and the frontend are working as expected in conjunction and also if the browser likes our app.
 
 [more...](cypress/README.md)
 
-## [Component Testing](webapp/testing.md)
+## Component Testing
 
 Individual Vue Components should also be documented and tested properly. This guarantees that they are reusable and the api gets more solid in the process.
 
 [more...](webapp/testing.md)
 
-## [Unit Testing](backend/testing.md)
+## Unit Testing
 
 Expecially the Backend relies on Unit Tests, as there are no Vue Components.