More reorg
Update readme.