Restructure project - adds