Project: springxd
Issue XD-3017: Fix package tangles
See: https://sonar43.spring.io/drilldown/measures/7173?metric=package_tangle_index
Story points: 5