Reviewing architecture
Refactored huge part of code