restructure framework and core updated
Clean Up