Architecture Review and Framework Refactoring