Changes to the media path and the models in Fees
Conflict resolved