Revert "LPS-48929 Keep the logic in the module"

This reverts commit 6da2a217e5968e2e055bb561da9f39456317aa3b.
LPS-48929 SF