more reorg.
converting back to multistory version.