Refactoring using architect