Refactor to folders