restructure project once again