Start moving to clean architecture based approach.