restructure to one project