Restructure framework