Restructure objects and approach