reorg of source layout