reorg of project strcuture.