[TASK] Refactoring step 2
[TASK] Refactoring for first stable version