Continue move to clean architecture based layout.
Changes to get part of system building.
Comment out old code to use as an example for what to do with the service.