Lots of reorging, cleaning