Fixed import
Refactored architecture
Merge branch 'refactor-architecture'