First step to refactor to a clean architecture