Here's a proposed set of changes, it's all proposal so please do comment

I'll have more changes on the remaining files soon.