reorg, rename objects, move controls to preview