re-architectured