Restructure project fieldsets