restructure framework continued