Refactored architectural goals article