Refactor to separate folder