Restructure framework.