More refactoring for the new architecture
Merge branch 'refactor/architecture' of github.com:kreta-io/kreta into refactor/architecture