REFACTOR ยท architecture-app-runtime