Refactoring around module finders