Hi Luke
With redoing your fee structure the best way i did this was i purchased an awesome little app for the mac called Office Time. https://www.officetime.net i think its only for the mac though (sorry Windows)
So basically i used this program to record every single project i did for 1 year to help me gauge both residential and commercial project as to how much i should charge on average.
I had all sorts of project from residential project with all emotions tied into it to residential where there weren’t any.
The program allows you to set you hourly rate so that you can keep right on track to see in the project is going accordingly to time and money. Not to mention it will speed up your work processes as you don’t want to make a loss.
Hope this Helps.