Refactor module finder to modules