Reorganise tree as it was becoming more than a bit of a mess.