Reverting some of the reorganistation as it didn't work - in fact made things worse