Architecture rework with Services