Move basic instruction fee management to FeeStructure