Architecture: The Next Generation

Refactoring