Restructure fees and align incentives