Switch to component architecture