Restructure fees and align incentives

This is for v2 vaults and not the fee model for v1 vaults as of now