refactoring, adding architecture
refactoring, adding the architecture