Refactoring to support installation of the binary through the module