More project restructuring