Change structure according to @korczis advices
Architecture tweak #2 with https://github.com/korczis
Thanks!!!