Restructure core