reorg & cleanup