Reorg code direcories