Restructure the stuff