Signed-off-by: NJeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

The goal of suych refactoring is to get rid of observers.
Its much easier to test and code when object creation and all other
related actions done in one class instead of splited across observers,
callbacks etc.
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>