Refactor file related to separate module