small reorg for interactive devel