Restructure to component-based design.