Re-thinking higher-level architecture