[SM-2850] Starting the Connection and some refactorings
2 files changed