complete restructure of entire project