Refactor architecture views