diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 9721e72fd..64eecd265 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,146 +1,19 @@
 parameters:
     level: 1
     paths:
-        - src/Bundle/ChillActivityBundle/Controller
-        - src/Bundle/ChillActivityBundle/Entity
-        - src/Bundle/ChillActivityBundle/Export
-        - src/Bundle/ChillActivityBundle/Form
-        - src/Bundle/ChillActivityBundle/Menu
-        - src/Bundle/ChillActivityBundle/Notification
-        - src/Bundle/ChillActivityBundle/Repository
-        - src/Bundle/ChillActivityBundle/Security/Authorization
-        - src/Bundle/ChillActivityBundle/Timeline
-        - src/Bundle/ChillAsideActivityBundle/src/Controller
-        - src/Bundle/ChillAsideActivityBundle/src/Entity
-        - src/Bundle/ChillAsideActivityBundle/src/Form
-        - src/Bundle/ChillAsideActivityBundle/src/Menu
-        - src/Bundle/ChillAsideActivityBundle/src/Repository
-        - src/Bundle/ChillBudgetBundle/Calculator
-        - src/Bundle/ChillBudgetBundle/Config
-        - src/Bundle/ChillBudgetBundle/Controller
-        - src/Bundle/ChillBudgetBundle/Entity
-        - src/Bundle/ChillBudgetBundle/Form
-        - src/Bundle/ChillBudgetBundle/Menu
-        - src/Bundle/ChillBudgetBundle/Repository
-        - src/Bundle/ChillBudgetBundle/Security/Authorization
-        - src/Bundle/ChillBudgetBundle/Templating
-        - src/Bundle/ChillCalendarBundle/Controller
-        - src/Bundle/ChillCalendarBundle/Entity
-        - src/Bundle/ChillCalendarBundle/Event
-        - src/Bundle/ChillCalendarBundle/Form
-        - src/Bundle/ChillCalendarBundle/Menu
-        - src/Bundle/ChillCalendarBundle/Repository
-        - src/Bundle/ChillCalendarBundle/Controller
-        - src/Bundle/ChillCustomFieldsBundle/Command
-        - src/Bundle/ChillCustomFieldsBundle/Controller
-        - src/Bundle/ChillCustomFieldsBundle/CustomFields
-        - src/Bundle/ChillCustomFieldsBundle/Entity
-        - src/Bundle/ChillCustomFieldsBundle/Form
-        - src/Bundle/ChillCustomFieldsBundle/Service
-        - src/Bundle/ChillDocGeneratorBundle/Context
-        - src/Bundle/ChillDocGeneratorBundle/Controller
-        - src/Bundle/ChillDocGeneratorBundle/Entity
-        - src/Bundle/ChillDocGeneratorBundle/Form
-        - src/Bundle/ChillDocGeneratorBundle/Repository
-        - src/Bundle/ChillDocStoreBundle/Controller
-        - src/Bundle/ChillDocStoreBundle/Entity
-        - src/Bundle/ChillDocStoreBundle/EntityRepository
-        - src/Bundle/ChillDocStoreBundle/Form
-        - src/Bundle/ChillDocStoreBundle/Menu
-        - src/Bundle/ChillDocStoreBundle/Object
-        - src/Bundle/ChillDocStoreBundle/Repository
-        - src/Bundle/ChillDocStoreBundle/Security/Authorization
-        - src/Bundle/ChillEventBundle/Controller
-        - src/Bundle/ChillEventBundle/Entity
-        - src/Bundle/ChillEventBundle/Form
-        - src/Bundle/ChillEventBundle/Menu
-        - src/Bundle/ChillEventBundle/Repository
-        - src/Bundle/ChillEventBundle/Search
-        - src/Bundle/ChillEventBundle/Security/Authorization
-        - src/Bundle/ChillEventBundle/Timeline
-        - src/Bundle/ChillFamilyMembersBundle/Config
-        - src/Bundle/ChillFamilyMembersBundle/Controller
-        - src/Bundle/ChillFamilyMembersBundle/Entity
-        - src/Bundle/ChillFamilyMembersBundle/Form
-        - src/Bundle/ChillFamilyMembersBundle/Menu
-        - src/Bundle/ChillFamilyMembersBundle/Repository
-        - src/Bundle/ChillFamilyMembersBundle/Security
-        - src/Bundle/ChillFamilyMembersBundle/Templating
-        - src/Bundle/ChillMainBundle/Center
-        - src/Bundle/ChillMainBundle/Command
-        - src/Bundle/ChillMainBundle/Controller
-        - src/Bundle/ChillMainBundle/CRUD
-        - src/Bundle/ChillMainBundle/Doctrine
-        - src/Bundle/ChillMainBundle/Entity
-        - src/Bundle/ChillMainBundle/Export
-        - src/Bundle/ChillMainBundle/Form
-        - src/Bundle/ChillMainBundle/Notification
-        - src/Bundle/ChillMainBundle/Pagination
-        - src/Bundle/ChillMainBundle/Phonenumber
-        - src/Bundle/ChillMainBundle/Redis
-        - src/Bundle/ChillMainBundle/Repository
-        - src/Bundle/ChillMainBundle/Routing
-        - src/Bundle/ChillMainBundle/Search
-        - src/Bundle/ChillMainBundle/Security
-        - src/Bundle/ChillMainBundle/Serializer
-        - src/Bundle/ChillMainBundle/Templating
-        - src/Bundle/ChillMainBundle/Timeline
-        - src/Bundle/ChillMainBundle/Util
-        - src/Bundle/ChillMainBundle/Validation
-        - src/Bundle/ChillMainBundle/Validator/Constraints
-        - src/Bundle/ChillPersonBundle/AccompanyingPeriod
-        - src/Bundle/ChillPersonBundle/Actions
-        - src/Bundle/ChillPersonBundle/Command
-        - src/Bundle/ChillPersonBundle/Config
-        - src/Bundle/ChillPersonBundle/Controller
-        - src/Bundle/ChillPersonBundle/CRUD/Controller
-        - src/Bundle/ChillPersonBundle/Doctrine/DQL
-        - src/Bundle/ChillPersonBundle/Entity
-        - src/Bundle/ChillPersonBundle/EventListener
-        - src/Bundle/ChillPersonBundle/Export
-        - src/Bundle/ChillPersonBundle/Form
-        - src/Bundle/ChillPersonBundle/Household
-        - src/Bundle/ChillPersonBundle/Menu
-        - src/Bundle/ChillPersonBundle/Notification
-        - src/Bundle/ChillPersonBundle/Privacy
-        - src/Bundle/ChillPersonBundle/Repository
-        - src/Bundle/ChillPersonBundle/Search
-        - src/Bundle/ChillPersonBundle/Security/Authorization
-        - src/Bundle/ChillPersonBundle/Serializer/Normalizer
-        - src/Bundle/ChillPersonBundle/Service/Import
-        - src/Bundle/ChillPersonBundle/Templating/Entity
-        - src/Bundle/ChillPersonBundle/Timeline
-        - src/Bundle/ChillPersonBundle/Validator/Constraints
-        - src/Bundle/ChillPersonBundle/Widget
-        - src/Bundle/ChillReportBundle/Controller
-        - src/Bundle/ChillReportBundle/Entity
-        - src/Bundle/ChillReportBundle/Export
-        - src/Bundle/ChillReportBundle/Form
-        - src/Bundle/ChillReportBundle/Search
-        - src/Bundle/ChillReportBundle/Security/Authorization
-        - src/Bundle/ChillReportBundle/Timeline
-        - src/Bundle/ChillTaskBundle/Controller
-        - src/Bundle/ChillTaskBundle/Entity
-        - src/Bundle/ChillTaskBundle/Event
-        - src/Bundle/ChillTaskBundle/Form
-        - src/Bundle/ChillTaskBundle/Menu
-        - src/Bundle/ChillTaskBundle/Repository
-        - src/Bundle/ChillTaskBundle/Security/Authorization
-        - src/Bundle/ChillTaskBundle/Templating
-        - src/Bundle/ChillTaskBundle/Timeline
-        - src/Bundle/ChillTaskBundle/Workflow
-        - src/Bundle/ChillThirdPartyBundle/Controller
-        - src/Bundle/ChillThirdPartyBundle/Entity
-        - src/Bundle/ChillThirdPartyBundle/Form
-        - src/Bundle/ChillThirdPartyBundle/Menu
-        - src/Bundle/ChillThirdPartyBundle/Repository
-        - src/Bundle/ChillThirdPartyBundle/Search
-        - src/Bundle/ChillThirdPartyBundle/Security/Voter
-        - src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer
-        - src/Bundle/ChillThirdPartyBundle/Templating/Entity
-        - src/Bundle/ChillThirdPartyBundle/ThirdPartyType
-        - src/Bundle/ChillWopiBundle/src
+        - src/
+    excludePaths:
+        - src/Bundle/*/Tests/*
+        - src/Bundle/*/config/*
+        - src/Bundle/*/migrations/*
+        - src/Bundle/*/translations/*
+        - src/Bundle/*/Resources/*
+        - src/Bundle/*/src/Tests/*
+        - src/Bundle/*/src/config/*
+        - src/Bundle/*/src/migrations/*
+        - src/Bundle/*/src/translations/*
+        - src/Bundle/*/src/Resources/*
+
 includes:
     - phpstan-baseline.neon
 
-