Refactor in several parts. Adding exchange-service, but not used yet.