reorg of components repository