re-design architecture