Refactored location of the module