As I'm distracted trying to get 1.5.1 I've lost track of what is being moved and why. I'd suggest doing whatever you need to do to get your workspace clean and we can take a step back before we do any more aesthetic refactoring to try and get as much of it done in one pass as we can.
If we are all happy to commit a day or so to focus and discuss the subject I'm sure we can come to some conclusion. Regards Simon
