Revert "Fixing installation issues"

This reverts commit cbb99ee5a015dad1774b33ef8a7ab724e38b83e9.
Revert "Install using moduleManager not moduleModel"

This reverts commit 5a49947be8d5cd86d5ab40cb1932265aca7b3547.