Make things better aligned with Clean Architecture.