directory reorg done; imports updated so everything builds