Heavy reorganization - works but still a lot to be done