Revert "Revert "Adapted package references in src projects. WTI-2802""
This reverts commit 660059ca183dcf86286d28f068748b6efb8657e5.
This reverts commit 660059ca183dcf86286d28f068748b6efb8657e5.